remove mkl-service as a requirement, replacing with mkl

mkl-service is now an optional requirement, needed when the scipy interface is installed

Author: ndgrigorian

.github/workflows/build-with-clang.yml

@@ -55,7 +55,7 @@ jobs:
 
       - name: Install mkl_fft dependencies
         run: |
-          pip install meson-python ninja cython cmake
+          pip install meson-python ninja cython cmake mkl
           pip install ${{ matrix.numpy_version }}
 
       - name: List oneAPI folder content

.github/workflows/build-with-standard-clang.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Install mkl_fft dependencies
         run: |
-          pip install meson-python ninja cmake cython mkl-service
+          pip install meson-python ninja cmake cython mkl-
           pip install mkl-devel
           pip install ${{ matrix.numpy_version }}
 
@@ -58,7 +58,7 @@ jobs:
 
       - name: Run mkl_fft tests
         run: |
-          pip install pytest
+          pip install pytest scipy mkl-service
           # mkl_fft cannot be installed in editable mode, we need
           # to change directory before importing it and running tests
           cd ..

.github/workflows/build_pip.yml

@@ -39,13 +39,13 @@ jobs:
 
       - name: Install MKL
         run: |
-          conda install mkl-devel mkl-service
+          conda install mkl-devel mkl
 
       - name: Build conda package
         run: |
           pip install --no-cache-dir meson-python ninja cmake cython
           pip install --no-cache-dir numpy ${{ matrix.use_pre }}
           pip install -e ".[test]" --no-build-isolation --verbose
-          pip install scipy pytest
+          pip install scipy pytest mkl-service
           pip list
           python -m pytest -v mkl_fft/tests

.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

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

conda-recipe/meta.yaml

@@ -43,7 +43,7 @@ requirements:
     run:
       - python
       - python-gil     # [py>=314]
-      - mkl-service
+      - {{ pin_compatible('mkl') }}
       {% if use_numpy_base %}
       - numpy-base
       {% else %}
@@ -55,8 +55,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

@@ -23,12 +23,22 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import importlib.util
+import warnings
+
 from . import numpy_fft
 
-# find scipy, not scipy.fft, to avoid circular dependency
-try:
-    import scipy
-except ImportError:
-    pass
-else:
-    from . import scipy_fft
+__all__ = ["numpy_fft"]
+
+_has_scipy = importlib.util.find_spec("scipy") is not None
+_has_mkl_service = importlib.util.find_spec("mkl") is not None
+
+if _has_scipy:
+    if not _has_mkl_service:
+        pass
+    else:
+        from . import scipy_fft
+
+        __all__.append("scipy_fft")
+
+del importlib, warnings, _has_scipy, _has_mkl_service

pyproject.toml

@@ -55,7 +55,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"]
@@ -65,8 +65,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"