Skip to content

Commit f0e3f2b

Browse files
committed
* Upgrade presets for CPython 3.14.6, NumPy 2.5.0, SciPy 1.18.0
1 parent 4dff054 commit f0e3f2b

45 files changed

Lines changed: 857 additions & 642 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/deploy-macosx/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runs:
2424
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/MacOSX10*
2525
fi
2626
27-
brew uninstall --force --ignore-dependencies cmake gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 gcc@13 gcc@14 little-cms2 maven openblas r
27+
brew uninstall --force --ignore-dependencies cmake gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 gcc@13 gcc@14 gcc@15 gcc@16 little-cms2 maven openblas r
2828
brew install --overwrite boost ccache swig autoconf-archive automake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr pcre ssdeep yajl ninja meson pkgconf
2929
3030
FORMULAE=()

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Add new `SampleOnnxMNIST` in samples for TensorRT ([pull #1742](https://github.com/bytedeco/javacpp-presets/pull/1742))
99
* Fix loading issues with `libomp.dylib` and `libiomp5.dylib` for DNNL and PyTorch on Mac
1010
* Include `model_package_loader.h` header file in presets for PyTorch ([issue #1729](https://github.com/bytedeco/javacpp-presets/issues/1729))
11-
* Upgrade presets for FFmpeg 8.1.1, MKL 2026.0.0, DNNL 3.12.1, OpenBLAS 0.3.33, CUDA 13.2.1, cuDNN 9.21.1.3, NCCL 2.30.4, nvCOMP 5.2.0.10, OpenCL 3.1.1, FFTW 3.3.11, CPython 3.14.5, NumPy 2.4.6, SciPy 1.17.1, LLVM 22.1.7, PyTorch 2.12.0, TensorFlow Lite 2.21.0, TensorRT 10.16.1.11, Triton Inference Server 2.68.0, ONNX 1.21.0, ONNX Runtime 1.26.0 ([pull #1753](https://github.com/bytedeco/javacpp-presets/pull/1753)), and their dependencies
11+
* Upgrade presets for FFmpeg 8.1.1, MKL 2026.0.0, DNNL 3.12.1, OpenBLAS 0.3.33, CUDA 13.2.1, cuDNN 9.21.1.3, NCCL 2.30.4, nvCOMP 5.2.0.10, OpenCL 3.1.1, FFTW 3.3.11, CPython 3.14.6, NumPy 2.5.0, SciPy 1.18.0, LLVM 22.1.7, PyTorch 2.12.0, TensorFlow Lite 2.21.0, TensorRT 10.16.1.11, Triton Inference Server 2.68.0, ONNX 1.21.0, ONNX Runtime 1.26.0 ([pull #1753](https://github.com/bytedeco/javacpp-presets/pull/1753)), and their dependencies
1212
* Compile classes with `parameters` bumping minimum requirements to Java SE 8 and Android 7.0 ([issue #1739](https://github.com/bytedeco/javacpp-presets/issues/1739))
1313

1414
### February 22, 2026 version 1.5.13

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
207207
* FFTW 3.3.11 http://www.fftw.org/download.html
208208
* GSL 2.8 http://www.gnu.org/software/gsl/#downloading
209209
* CPython 3.14.x https://www.python.org/downloads/
210-
* NumPy 2.4.x https://github.com/numpy/numpy
211-
* SciPy 1.17.x https://github.com/scipy/scipy
210+
* NumPy 2.5.x https://github.com/numpy/numpy
211+
* SciPy 1.18.x https://github.com/scipy/scipy
212212
* Gym 0.26.x https://github.com/openai/gym
213213
* LLVM 22.1.x http://llvm.org/releases/download.html
214214
* libffi 3.5.x https://github.com/libffi/libffi

cpython/cppbuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
77
exit
88
fi
99

10-
OPENSSL=openssl-3.5.6
11-
CPYTHON_VERSION=3.14.5
10+
OPENSSL=openssl-3.5.7
11+
CPYTHON_VERSION=3.14.6
1212
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
1313
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
1414

cpython/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>3.14.5-${project.parent.version}</version>
15+
<version>3.14.6-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CPython</name>
1717

1818
<properties>

cpython/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpython</artifactId>
14-
<version>3.14.5-${project.parent.version}</version>
14+
<version>3.14.6-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CPython</name>
1616

1717
<dependencies>

cpython/src/gen/java/org/bytedeco/cpython/global/python.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ There is also (independent) API version information in modsupport.h.
191191
/*--start constants--*/
192192
public static final int PY_MAJOR_VERSION = 3;
193193
public static final int PY_MINOR_VERSION = 14;
194-
public static final int PY_MICRO_VERSION = 5;
194+
public static final int PY_MICRO_VERSION = 6;
195195
public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL;
196196
public static final int PY_RELEASE_SERIAL = 0;
197197

198198
/* Version as a string */
199-
public static final String PY_VERSION = "3.14.5";
199+
public static final String PY_VERSION = "3.14.6";
200200
/*--end constants--*/
201201

202202

numpy/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Introduction
99
------------
1010
This directory contains the JavaCPP Presets module for:
1111

12-
* NumPy 2.4.6 http://www.numpy.org/
12+
* NumPy 2.5.0 http://www.numpy.org/
1313

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

@@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4848
<dependency>
4949
<groupId>org.bytedeco</groupId>
5050
<artifactId>numpy-platform</artifactId>
51-
<version>2.4.6-1.5.14-SNAPSHOT</version>
51+
<version>2.5.0-1.5.14-SNAPSHOT</version>
5252
</dependency>
5353

5454
<!-- Additional dependencies to use bundled full version of MKL -->

numpy/cppbuild.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
77
exit
88
fi
99

10-
NUMPY_VERSION=2.4.6
10+
NUMPY_VERSION=2.5.0
1111
download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz
1212

1313
mkdir -p $PLATFORM
@@ -85,7 +85,7 @@ fi
8585
export PYTHONPATH="$PYTHON_INSTALL_PATH"
8686
mkdir -p "$PYTHON_INSTALL_PATH"
8787

88-
TOOLS="setuptools==67.6.1 cython==3.0.10"
88+
TOOLS="setuptools==67.6.1 cython==3.2.6"
8989
if ! $PYTHON_BIN_PATH -m pip install --target=$PYTHON_LIB_PATH $TOOLS; then
9090
echo "extra_link_args = -lgfortran" >> site.cfg
9191
chmod +x "$CPYTHON_HOST_PATH/bin/python3.14"
@@ -128,7 +128,7 @@ case $PLATFORM in
128128
;;
129129
linux-x86)
130130
# https://github.com/numpy/numpy/pull/20695
131-
sedinplace 's/machine = platform.machine()/return False/g' numpy/core/setup.py
131+
# sedinplace 's/machine = platform.machine()/return False/g' numpy/core/setup.py
132132
ATLAS=None CC="gcc -m32" "$PYTHON_BIN_PATH" -m pip install . --prefix $INSTALL_PATH --config-settings=build-dir=build
133133
strip $(find ../ -iname *.so)
134134
;;
@@ -137,14 +137,14 @@ case $PLATFORM in
137137
strip $(find ../ -iname *.so)
138138
;;
139139
macosx-*)
140-
sedinplace 's/-std=c99/-w/g' numpy/distutils/ccompiler.py
140+
# sedinplace 's/-std=c99/-w/g' numpy/distutils/ccompiler.py
141141
ATLAS=None "$PYTHON_BIN_PATH" -m pip install . --prefix $INSTALL_PATH --config-settings=build-dir=build
142142
# need to add RPATH so it can find MKL in cache
143143
for f in $(find ../ -iname *.so); do install_name_tool -add_rpath @loader_path/../../../ $f; done
144144
;;
145145
windows-x86)
146-
sedinplace '/ccompiler._default_compilers = /,+2d' numpy/distutils/ccompiler.py # don't try to use GCC
147-
sedinplace 's/ltype = long_double_representation(pyod("_configtest"))/ltype = "IEEE_DOUBLE_LE"/g' numpy/core/setup_common.py
146+
# sedinplace '/ccompiler._default_compilers = /,+2d' numpy/distutils/ccompiler.py # don't try to use GCC
147+
# sedinplace 's/ltype = long_double_representation(pyod("_configtest"))/ltype = "IEEE_DOUBLE_LE"/g' numpy/core/setup_common.py
148148
ATLAS=None "$PYTHON_BIN_PATH" -m pip install . --prefix $INSTALL_PATH --config-settings=build-dir=build
149149
;;
150150
windows-x86_64)

numpy/platform/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>numpy-platform</artifactId>
15-
<version>2.4.6-${project.parent.version}</version>
15+
<version>2.5.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for NumPy</name>
1717

1818
<properties>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.bytedeco</groupId>
3030
<artifactId>cpython-platform</artifactId>
31-
<version>3.14.5-${project.parent.version}</version>
31+
<version>3.14.6-${project.parent.version}</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)