Skip to content

Commit

Permalink
* Upgrade presets for SciPy 1.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@saudet
saudet committed Jan 23, 2024
1 parent 3a4beaa commit ec319c5
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360))
* Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388))
* Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361))
* Upgrade presets for OpenCV 4.9.0, FFmpeg 6.1.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.4, OpenBLAS 0.3.26, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.3, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.84.1, Tesseract 5.3.4, CUDA 12.3.2, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies
* Upgrade presets for OpenCV 4.9.0, FFmpeg 6.1.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.4, OpenBLAS 0.3.26, ARPACK-NG 3.9.1, CPython 3.12.1, NumPy 1.26.3, SciPy 1.12.0, LLVM 17.0.6, Leptonica 1.84.1, Tesseract 5.3.4, CUDA 12.3.2, cuDNN 8.9.7, NCCL 2.19.3, OpenCL 3.0.15, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.41.0, DepthAI 2.24.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies

### June 6, 2023 version 1.5.9
* Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367))
Expand Down
2 changes: 1 addition & 1 deletion platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-${project.version}</version>
<version>1.12.0-${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.bytedeco</groupId>-->
Expand Down
4 changes: 2 additions & 2 deletions scipy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* SciPy 1.11.4 https://www.scipy.org/
* SciPy 1.12.0 https://www.scipy.org/

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-1.5.10-SNAPSHOT</version>
<version>1.12.0-1.5.10-SNAPSHOT</version>
</dependency>

<!-- Additional dependencies to use bundled full version of MKL -->
Expand Down
13 changes: 8 additions & 5 deletions scipy/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ if [[ -z "$PLATFORM" ]]; then
fi

BOOST=1_75_0
SCIPY_VERSION=1.11.4
SCIPY_VERSION=1.12.0
download http://downloads.sourceforge.net/project/boost/boost/${BOOST//_/.}/boost_$BOOST.tar.gz boost_$BOOST.tar.gz
download https://github.com/data-apis/array-api-compat/archive/05548f0.tar.gz array-api-compat-05548f0.tar.gz
download https://github.com/scipy/HiGHS/archive/4a12295.tar.gz HiGHS-4a12295.tar.gz
download https://github.com/scipy/unuran/archive/81a1fd1.tar.gz unuran-81a1fd1.tar.gz
download https://github.com/scipy/unuran/archive/1d315c6.tar.gz unuran-1d315c6.tar.gz
download https://github.com/scipy/PROPACK/archive/96f6800.tar.gz PROPACK-96f6800.tar.gz
download https://github.com/scipy/scipy/archive/v$SCIPY_VERSION.tar.gz scipy-$SCIPY_VERSION.tar.gz

Expand Down Expand Up @@ -51,11 +52,13 @@ NUMPY_PATH="${NUMPY_PATH//\\//}"

echo "Decompressing archives..."
tar --totals -xzf ../boost_$BOOST.tar.gz
tar --totals -xzf ../array-api-compat-*.tar.gz
tar --totals -xzf ../HiGHS-*.tar.gz
tar --totals -xzf ../unuran-*.tar.gz
tar --totals -xzf ../PROPACK-*.tar.gz
tar --totals -xzf ../scipy-$SCIPY_VERSION.tar.gz
cp -a boost_$BOOST/* scipy-$SCIPY_VERSION/scipy/_lib/boost_math/
cp -a array-api-compat-*/* scipy-$SCIPY_VERSION/scipy/_lib/array_api_compat/
cp -a HiGHS-*/* scipy-$SCIPY_VERSION/scipy/_lib/highs/
cp -a unuran-*/* scipy-$SCIPY_VERSION/scipy/_lib/unuran/
cp -a PROPACK-*/* scipy-$SCIPY_VERSION/scipy/sparse/linalg/_propack/PROPACK/
Expand All @@ -72,11 +75,11 @@ lapack = blas\\

mkdir -p scipy/_lib/boost_math/include
cp -a scipy/_lib/boost_math/boost scipy/_lib/boost_math/include
mv _setup.py setup.py
# mv _setup.py setup.py

# prevent setuptools from trying to build NumPy
sedinplace '/req_np/d' setup.py
sedinplace 's/README.rst/README.md/g' scipy/_lib/setup.py
# sedinplace '/req_np/d' setup.py
# sedinplace 's/README.rst/README.md/g' scipy/_lib/setup.py

echo "[openblas]" > site.cfg
echo "libraries = openblas" >> site.cfg
Expand Down
2 changes: 1 addition & 1 deletion scipy/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
<name>JavaCPP Presets Platform for SciPy</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion scipy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>scipy</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
<name>JavaCPP Presets for SciPy</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scipy/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-1.5.10-SNAPSHOT</version>
<version>1.12.0-1.5.10-SNAPSHOT</version>
</dependency>

<!-- Additional dependencies to use bundled full version of MKL -->
Expand Down
2 changes: 1 addition & 1 deletion tvm/platform/gpu/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tvm/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
4 changes: 2 additions & 2 deletions tvm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>scipy-platform</artifactId>
<version>1.11.4-${project.parent.version}</version>
<version>1.12.0-${project.parent.version}</version>
</dependency>
</dependencies>
<configuration>
Expand Down

0 comments on commit ec319c5

Please sign in to comment.