Merge pull request #6 from Fluorescence-Tools/development

Development
Fluorescence-Tools · Feb 12, 2024 · af4afe8 · af4afe8
2 parents b7865c8 + 0c603ae
commit af4afe8
Show file tree

Hide file tree

Showing 10 changed files with 26,160 additions and 9 deletions.
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -1,6 +1,7 @@
 name: Conda Build
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - development
@@ -39,6 +40,7 @@ jobs:
       - name: Build Conda Package
         shell: bash -el {0}
         run: |
+          conda config --add channels tpeulen
           mamba install conda-build boa
           cd conda-recipe
           curl -sLO  https://raw.githubusercontent.com/conda-forge/conda-forge-pinning-feedstock/084b098a28a7a66e9a0967d156bc55b9ebfc6726/recipe/conda_build_config.yaml

diff --git a/.github/workflows/conda-release.yml b/.github/workflows/conda-release.yml
@@ -2,6 +2,7 @@
 name: Build and Upload Conda Packages
 
 on:
+  workflow_dispatch:
 #  push:
 #    branches:
 #      - develop
@@ -43,6 +44,7 @@ jobs:
         shell: bash -el {0}
         run: |
           mamba install conda-build boa anaconda-client
+          conda config --add channels tpeulen
           cd conda-recipe
           # Use older conda_build_config -> boost-cpp 1.78
           curl -sLO  https://raw.githubusercontent.com/conda-forge/conda-forge-pinning-feedstock/084b098a28a7a66e9a0967d156bc55b9ebfc6726/recipe/conda_build_config.yaml

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,9 +114,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
 ## CONDA
 ###########################
 FIND_PACKAGE(Conda)
-
-## TTTRLIB
-###########################
 LINK_LIBRARIES(tttrlib)
 
 ## Boost

diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -3,12 +3,19 @@ git submodule update --recursive --init --remote
 md build
 cd build
 
+REM Call Python with the --version flag to get the version information
+for /f "tokens=2 delims= " %%v in ('%PYTHON% --version 2^>^&1') do set PYTHON_VERSION=%%v
+
+REM Extract only the numeric part of the version
+for /f "tokens=1-3 delims=." %%a in ("%PYTHON_VERSION%") do set PYTHON_VERSION_NUMERIC=%%a.%%b.%%c
+
 cmake .. -G "NMake Makefiles" ^
  -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
  -DCMAKE_PREFIX_PATH="%PREFIX%" ^
  -DBUILD_PYTHON_INTERFACE=ON ^
  -DCMAKE_BUILD_TYPE=Release ^
  -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="%SP_DIR%" ^
+ -DPYTHON_VERSION="%PYTHON_VERSION_NUMERIC%" ^
  -DCMAKE_SWIG_OUTDIR="%SP_DIR%"
 
 nmake

diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -10,6 +10,7 @@ cmake \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$SP_DIR" \
  -DCMAKE_SWIG_OUTDIR="$SP_DIR" \
+ -DPYTHON_VERSION=$(python -c 'import platform; print(platform.python_version())')\
  ..
 
 make

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -36,7 +36,7 @@ requirements:
     - python
     - boost-cpp
     - {{ pin_compatible('numpy') }}
-    - {{ pin_compatible('tttrlib') }}
+    - {{ pin_compatible('tttrlib', max_pin='x.x.x') }}
     - llvm-openmp # [osx]
 
 test:

diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -12,7 +12,10 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 
 
 IF(BUILD_PYTHON_INTERFACE)
-    FIND_PACKAGE(Python)
+    FIND_PACKAGE(Python ${PYTHON_VERSION} EXACT COMPONENTS Interpreter Development.Module NumPy)
+    INCLUDE_DIRECTORIES(BEFORE ${Python_NumPy_INCLUDE_DIR} ${Python_INCLUDE_DIR})
+    LINK_LIBRARIES(${Python_LIBRARY} Python::NumPy)
+
     MESSAGE(${SRC_files})
     FILE(TO_CMAKE_PATH "${CMAKE_SWIG_OUTDIR}" CMAKE_SWIG_OUTDIR)
     message(CMAKE_SWIG_OUTDIR="${CMAKE_SWIG_OUTDIR}")

diff --git a/src/fsconv.cpp b/src/fsconv.cpp
@@ -79,7 +79,7 @@ void fconv(double *fit, double *x, double *lamp, int numexp, int start, int stop
 
 // fast convolution AVX
 void fconv_avx(double *fit, double *x, double *lamp, int numexp, int start, int stop, double dt) {
-#ifdef WITH_AVX
+#ifdef __AVX2__
     int start1 = std::max(1, start);
 
     // make sure that there are always multiple of 4 in the lifetimes
@@ -187,7 +187,8 @@ void fconv_per(double *fit, double *x, double *lamp, int numexp, int start, int
 // fast convolution, high repetition rate, AVX
 void fconv_per_avx(double *fit, double *x, double *lamp, int numexp, int start, int stop,
                    int n_points, double period, double dt) {
-#ifdef WITH_AVX
+
+#ifdef __AVX2__
 #if VERBOSE_FIT2X
     std::clog << "fconv_per_avx" << std::endl;
     std::clog << "-- numexp: " << numexp << std::endl;

diff --git a/test/test_fsconv.py b/test/test_fsconv.py
@@ -131,7 +131,6 @@ def test_fconv(self):
             np.allclose(model_ref, model_fconv), True
         )
 
-        # AVX won't be supported on Apple -> M1
         if platform != "darwin":
             model_fconv_avx = np.zeros_like(irf)
             fit2x.fconv_avx(
@@ -200,7 +199,9 @@ def test_fconv_per(self):
                 stop=-1,
                 dt=dt
             )
-            np.testing.assert_allclose(model_fconv_avx, model_fconv_per)
+            self.assertEqual(
+                np.allclose(model_fconv_avx, model_fconv_per), True
+            )
 
     def test_fconv_per_cs(self):
         period = 13.0