conda: updated recipe

ExaScience · Jun 11, 2024 · 618f98a · 618f98a
1 parent 8edfc2d
commit 618f98a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 25 deletions.
diff --git a/conda-recipes/conda_build_config.yaml b/conda-recipes/conda_build_config.yaml
@@ -1,23 +1,17 @@
-CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.9.sdk        # [osx]
-
 python:
-    - 3.7
     - 3.8
     - 3.9
+    - 3.10
+    - 3.11
 
 blas_impl:
     - openblas
     - mkl
 
-numpy:
-    - 1.16      
-
 hdf5:
     - 1.10.4
     - 1.10.6
 
 pin_run_as_build:
   libboost: x.x
-  numpy: x.x
   hdf5: x.x.x
diff --git a/conda-recipes/smurff/build.sh b/conda-recipes/smurff/build.sh
@@ -1,12 +1,10 @@
 #!/bin/bash
 
-export CMAKE_ARGS="-DENABLE_MKL=ON -DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_MPI=OFF"
+export CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_MPI=OFF"
 
 # make sure we use CONDA_BUILD_SYSROOT
 # https://github.com/conda/conda-build/issues/3452#issuecomment-47539707
 [[ ${target_platform} == "osx-64" ]] && \
     CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT}"
 
-$PYTHON setup.py install \
-    --install-binaries \
-    --single-version-externally-managed --record=record.txt
+$PYTHON -m pip install . --no-deps -vv
diff --git a/conda-recipes/smurff/meta.yaml b/conda-recipes/smurff/meta.yaml
@@ -18,30 +18,27 @@ requirements:
     - llvm-openmp             # [osx]
   host:
     - llvm-openmp             # [osx]
-    - intel-openmp
-    - mkl-devel
-    - eigen3
+    - mkl-devel               # [(linux64 or win64) and blas_impl == 'mkl']
+    - eigen
     - libboost
     - pybind11
     - highfive >=2.2
     - h5py
     - python {{ python }}
-    - setuptools
+    - scikit-build-core
     - setuptools_scm
-    - numpy
   run:
     - python {{ python }}
-    - intel-openmp # [not win]
-    - mkl
-    - libboost # [not win]
+    - mkl                   # [(linux64 or win64) and blas_impl == 'mkl']
+    - libboost              # [not win]
     - numpy
     - scipy
     - pandas
     - scikit-learn
     - hdf5
     - h5py
     - h5sparse-tensor >=0.2.2
-  
+
 test:
   requires:
     - setuptools

diff --git a/conda-recipes/smurff/run_test.bat b/conda-recipes/smurff/run_test.bat
@@ -1,3 +1 @@
-%CONDA_PREFIX%\libexec\tests ~[random]
-if errorlevel 1 exit 1
-%PYTHON% -m pytest 
+%PYTHON% -m pytest
diff --git a/conda-recipes/smurff/run_test.sh b/conda-recipes/smurff/run_test.sh
@@ -1,2 +1 @@
-$PREFIX/libexec/tests
 $PYTHON -m pytest -v python/test
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		$PREFIX/libexec/tests
		$PYTHON -m pytest -v python/test