Merge pull request #305 from IntelPython/drop-mkl-service-dependency

Make `mkl-service` an optional dependency

Author: ndgrigorian

.github/workflows/build_pip.yaml

@@ -44,10 +44,7 @@ jobs:
 
       - name: Install MKL
         run: |
-          conda install mkl-devel mkl-service
-          python -c "import sys; print(sys.executable)"
-          which python
-          python -c "import mkl; print(mkl.__file__)"
+          conda install mkl-devel
 
       - name: Build conda package
         run: |

.github/workflows/conda-package-cf.yml

@@ -143,7 +143,7 @@ jobs:
       - name: Install mkl_fft
         run: |
           CHANNELS=(-c "$GITHUB_WORKSPACE"/channel ${{ env.CHANNELS }})
-          conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} ${{ matrix.numpy }} "$PACKAGE_NAME" pytest scipy "${CHANNELS[@]}"
+          conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} ${{ matrix.numpy }} "$PACKAGE_NAME" pytest scipy mkl-service "${CHANNELS[@]}"
           # Test installed packages
           conda list -n ${{ env.TEST_ENV_NAME }}
 
@@ -318,7 +318,7 @@ jobs:
           FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
              SET PACKAGE_VERSION=%%F
           )
-          SET "TEST_DEPENDENCIES=pytest scipy"
+          SET "TEST_DEPENDENCIES=pytest scipy mkl-service"
           conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
 
       - name: Report content of test environment

.github/workflows/conda-package.yml

@@ -143,7 +143,7 @@ jobs:
         run: |
           CHANNELS=(-c "$GITHUB_WORKSPACE"/channel ${{ env.CHANNELS }})
           conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME"=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest "${CHANNELS[@]}"
-          conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" "${CHANNELS[@]}"
+          conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" "mkl-service" "${CHANNELS[@]}"
           # Test installed packages
           conda list -n ${{ env.TEST_ENV_NAME }}
 
@@ -308,7 +308,7 @@ jobs:
           )
           SET "TEST_DEPENDENCIES=pytest"
           conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
-          conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
+          conda install -n ${{ env.TEST_ENV_NAME }} scipy mkl-service -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
           }
       - name: Report content of test environment
         shell: cmd /C CALL {0}

conda-recipe-cf/meta.yaml

@@ -26,7 +26,7 @@ requirements:
     run:
       - python
       - python-gil     # [py>=314]
-      - mkl-service
+      - {{ pin_compatible('mkl') }}
       - numpy
 
 test:
@@ -35,6 +35,7 @@ test:
     requires:
       - pytest
       - scipy >=1.10
+      - mkl-service
     imports:
       - mkl_fft
       - mkl_fft.interfaces

conda-recipe/meta.yaml

@@ -40,7 +40,7 @@ requirements:
     run:
       - python
       - python-gil     # [py>=314]
-      - mkl-service
+      - {{ pin_compatible('mkl') }}
       {% if use_numpy_base %}
       - numpy-base
       {% else %}
@@ -52,8 +52,8 @@ test:
       - pytest -v --pyargs mkl_fft
     requires:
       - pytest
-      # This is a temporary python restriction
-      - scipy >=1.10   # [py<314]
+      - scipy >=1.10
+      - mkl-service
     imports:
       - mkl_fft
       - mkl_fft.interfaces

mkl_fft/interfaces/__init__.py

@@ -25,10 +25,22 @@
 
 from . import numpy_fft
 
-# find scipy, not scipy.fft, to avoid circular dependency
+__all__ = ["numpy_fft"]
+
 try:
     import scipy
+
+    del scipy
 except ImportError:
     pass
 else:
-    from . import scipy_fft
+    try:
+        import mkl
+
+        del mkl
+    except ImportError:
+        pass
+    else:
+        from . import scipy_fft
+
+        __all__.append("scipy_fft")

pyproject.toml

@@ -50,7 +50,7 @@ classifiers = [
   "Operating System :: POSIX",
   "Operating System :: Unix"
 ]
-dependencies = ["numpy>=1.26.4", "mkl-service"]
+dependencies = ["numpy>=1.26.4", "mkl"]
 description = "MKL-based FFT transforms for NumPy arrays"
 dynamic = ["version"]
 keywords = ["DFTI", "FFT", "Fourier", "MKL"]
@@ -60,8 +60,8 @@ readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.10,<3.15"
 
 [project.optional-dependencies]
-scipy_interface = ["scipy>=1.10"]
-test = ["pytest", "scipy>=1.10"]
+scipy_interface = ["scipy>=1.10", "mkl-service"]
+test = ["pytest", "scipy>=1.10", "mkl-service"]
 
 [project.urls]
 Download = "http://github.com/IntelPython/mkl_fft"