Merge pull request #8127 from asi1024/scipy-112

cupy · Jan 26, 2024 · 64cc70d · 64cc70d
2 parents 149a0a9 + 0f396bd
commit 64cc70d
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 9 deletions.
diff --git a/.pfnci/coverage.rst b/.pfnci/coverage.rst
@@ -1641,7 +1641,7 @@ CuPy CI Test Coverage
      - 
    * - 
      - 1.10
-     - 11
+     - 10
      - 
      - 
      - 
@@ -1664,7 +1664,7 @@ CuPy CI Test Coverage
      - 
      - 
      - ✅
-     - ✅
+     - 
      - ✅
      - 
      - 
@@ -1673,7 +1673,7 @@ CuPy CI Test Coverage
      - ✅
    * - 
      - 1.11
-     - 4
+     - 2
      - 
      - 
      - 
@@ -1692,11 +1692,43 @@ CuPy CI Test Coverage
      - 
      - ✅
      - ✅
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+   * - 
+     - 1.12
+     - 3
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
+     - 
      - ✅
      - ✅
      - 
      - 
-     - 
+     - ✅
      - 
      - 
      - 

diff --git a/.pfnci/linux/tests/cuda122.Dockerfile b/.pfnci/linux/tests/cuda122.Dockerfile
@@ -28,6 +28,6 @@ RUN pyenv install 3.12.0 && \
     pyenv global 3.12.0 && \
     pip install -U setuptools pip wheel
 
-RUN pip install -U 'numpy==1.26.*' 'scipy==1.11.*' 'optuna==3.*' 'cython==0.29.*'
+RUN pip install -U 'numpy==1.26.*' 'scipy==1.12.*' 'optuna==3.*' 'cython==0.29.*'
 RUN pip uninstall -y mpi4py cuda-python && \
     pip check
diff --git a/.pfnci/linux/tests/cuda122.multi.Dockerfile b/.pfnci/linux/tests/cuda122.multi.Dockerfile
@@ -28,6 +28,6 @@ RUN pyenv install 3.12.0 && \
     pyenv global 3.12.0 && \
     pip install -U setuptools pip wheel
 
-RUN pip install -U 'numpy==1.26.*' 'scipy==1.11.*' 'optuna==3.*' 'mpi4py==3.*' 'cython==0.29.*'
+RUN pip install -U 'numpy==1.26.*' 'scipy==1.12.*' 'optuna==3.*' 'mpi4py==3.*' 'cython==0.29.*'
 RUN pip uninstall -y cuda-python && \
     pip check
diff --git a/.pfnci/linux/tests/rocm-5-3.Dockerfile b/.pfnci/linux/tests/rocm-5-3.Dockerfile
@@ -34,6 +34,6 @@ RUN pyenv install 3.11.0 && \
     pyenv global 3.11.0 && \
     pip install -U setuptools pip wheel
 
-RUN pip install -U 'numpy==1.24.*' 'scipy==1.10.*' 'optuna==3.*' 'cython==0.29.*'
+RUN pip install -U 'numpy==1.24.*' 'scipy==1.12.*' 'optuna==3.*' 'cython==0.29.*'
 RUN pip uninstall -y mpi4py cuda-python && \
     pip check
diff --git a/.pfnci/matrix.yaml b/.pfnci/matrix.yaml
@@ -288,7 +288,7 @@
   cudnn: "8.8"
   python: "3.12"
   numpy: "1.26"
-  scipy: "1.11"
+  scipy: "1.12"
   optuna: "3"
   mpi4py: null
   cython: "0.29"
@@ -377,7 +377,7 @@
   cudnn: null
   python: "3.11"
   numpy: "1.24"
-  scipy: "1.10"
+  scipy: "1.12"
   optuna: "3"
   mpi4py: null
   cython: "0.29"

diff --git a/.pfnci/schema.yaml b/.pfnci/schema.yaml
@@ -342,6 +342,19 @@ scipy:
       - "1.24"
       - "1.25"
       - "1.26"
+  "1.12":
+    spec: "==1.12.*"
+    python:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+    numpy:
+      - "1.22"
+      - "1.23"
+      - "1.24"
+      - "1.25"
+      - "1.26"
   "pre":
     spec: ">=0a0"  # latest, including pre-releases
 optuna: