Skip to content

Commit

Permalink
* Upgrade presets for OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2,…
Browse files Browse the repository at this point in the history
… SciPy 1.11.2, LLVM 17.0.1, ONNX 1.14.1, ONNX Runtime 1.16.0
  • Loading branch information
saudet committed Sep 22, 2023
1 parent 22f66e5 commit 4958dd0
Show file tree
Hide file tree
Showing 209 changed files with 1,270 additions and 725 deletions.
2 changes: 2 additions & 0 deletions .github/actions/deploy-ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ runs:
$SUDO gem install apt-spy2
$SUDO apt-spy2 check
$SUDO apt-spy2 fix --commit
$SUDO sed -i 's/azure\.//' /etc/apt/apt-mirrors.txt /etc/apt/sources.list
$SUDO cat /etc/apt/apt-mirrors.txt /etc/apt/sources.list
$SUDO apt-get update
fi
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,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.8.0, DNNL 3.2.1, CPython 3.11.4, NumPy 1.25.1, SciPy 1.11.1, LLVM 17.0.0, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX Runtime 1.15.1, TVM 0.13.0, and their dependencies
* Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* MKL 2023.x https://software.intel.com/mkl
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
* DNNL 3.2.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.23 http://www.openblas.net/
* OpenBLAS 0.3.24 http://www.openblas.net/
* ARPACK-NG 3.9.0 https://github.com/opencollab/arpack-ng
* CMINPACK 1.3.8 https://github.com/devernay/cminpack
* FFTW 3.3.10 http://www.fftw.org/download.html
Expand Down
2 changes: 1 addition & 1 deletion arpack-ng/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions arpack-ng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -45,12 +45,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cminpack/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions cminpack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -41,12 +41,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cpython/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* CPython 3.11.4 https://www.python.org/
* CPython 3.11.5 https://www.python.org/

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

Expand Down Expand Up @@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.11.4-1.5.10-SNAPSHOT</version>
<version>3.11.5-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions cpython/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

OPENSSL=openssl-3.1.0
CPYTHON_VERSION=3.11.4
OPENSSL=openssl-3.1.3
CPYTHON_VERSION=3.11.5
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz

Expand Down
2 changes: 1 addition & 1 deletion cpython/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.11.4-${project.parent.version}</version>
<version>3.11.5-${project.parent.version}</version>
<name>JavaCPP Presets Platform for CPython</name>

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

<groupId>org.bytedeco</groupId>
<artifactId>cpython</artifactId>
<version>3.11.4-${project.parent.version}</version>
<version>3.11.5-${project.parent.version}</version>
<name>JavaCPP Presets for CPython</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cpython/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>cpython-platform</artifactId>
<version>3.11.4-1.5.10-SNAPSHOT</version>
<version>3.11.5-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
43 changes: 24 additions & 19 deletions cpython/src/gen/java/org/bytedeco/cpython/global/python.java
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ There is also (independent) API version information in modsupport.h.
/*--start constants--*/
public static final int PY_MAJOR_VERSION = 3;
public static final int PY_MINOR_VERSION = 11;
public static final int PY_MICRO_VERSION = 4;
public static final int PY_MICRO_VERSION = 5;
public static final int PY_RELEASE_LEVEL = PY_RELEASE_LEVEL_FINAL;
public static final int PY_RELEASE_SERIAL = 0;

/* Version as a string */
public static final String PY_VERSION = "3.11.4";
public static final String PY_VERSION = "3.11.5";
/*--end constants--*/

/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Expand Down Expand Up @@ -351,40 +351,40 @@ There is also (independent) API version information in modsupport.h.
/* #undef HAVE_CTERMID_R */

/* Define if you have the 'filter' function. */
public static final int HAVE_CURSES_FILTER = 1;
/* #undef HAVE_CURSES_FILTER */

/* Define to 1 if you have the <curses.h> header file. */
public static final int HAVE_CURSES_H = 1;
/* #undef HAVE_CURSES_H */

/* Define if you have the 'has_key' function. */
public static final int HAVE_CURSES_HAS_KEY = 1;
/* #undef HAVE_CURSES_HAS_KEY */

/* Define if you have the 'immedok' function. */
public static final int HAVE_CURSES_IMMEDOK = 1;
/* #undef HAVE_CURSES_IMMEDOK */

/* Define if you have the 'is_pad' function. */
public static final int HAVE_CURSES_IS_PAD = 1;
/* #undef HAVE_CURSES_IS_PAD */

/* Define if you have the 'is_term_resized' function. */
public static final int HAVE_CURSES_IS_TERM_RESIZED = 1;
/* #undef HAVE_CURSES_IS_TERM_RESIZED */

/* Define if you have the 'resizeterm' function. */
public static final int HAVE_CURSES_RESIZETERM = 1;
/* #undef HAVE_CURSES_RESIZETERM */

/* Define if you have the 'resize_term' function. */
public static final int HAVE_CURSES_RESIZE_TERM = 1;
/* #undef HAVE_CURSES_RESIZE_TERM */

/* Define if you have the 'syncok' function. */
public static final int HAVE_CURSES_SYNCOK = 1;
/* #undef HAVE_CURSES_SYNCOK */

/* Define if you have the 'typeahead' function. */
public static final int HAVE_CURSES_TYPEAHEAD = 1;
/* #undef HAVE_CURSES_TYPEAHEAD */

/* Define if you have the 'use_env' function. */
public static final int HAVE_CURSES_USE_ENV = 1;
/* #undef HAVE_CURSES_USE_ENV */

/* Define if you have the 'wchgat' function. */
public static final int HAVE_CURSES_WCHGAT = 1;
/* #undef HAVE_CURSES_WCHGAT */

/* Define to 1 if you have the <db.h> header file. */
public static final int HAVE_DB_H = 1;
Expand Down Expand Up @@ -884,6 +884,9 @@ There is also (independent) API version information in modsupport.h.
/* Define if compiling using Linux 4.1 or later. */
public static final int HAVE_LINUX_CAN_RAW_JOIN_FILTERS = 1;

/* Define to 1 if you have the <linux/limits.h> header file. */
public static final int HAVE_LINUX_LIMITS_H = 1;

/* Define to 1 if you have the <linux/memfd.h> header file. */
public static final int HAVE_LINUX_MEMFD_H = 1;

Expand Down Expand Up @@ -948,7 +951,7 @@ There is also (independent) API version information in modsupport.h.
public static final int HAVE_MEMFD_CREATE = 1;

/* Define to 1 if you have the <memory.h> header file. */
/* #undef HAVE_MEMORY_H */
public static final int HAVE_MEMORY_H = 1;

/* Define to 1 if you have the `memrchr' function. */
public static final int HAVE_MEMRCHR = 1;
Expand Down Expand Up @@ -981,7 +984,7 @@ There is also (independent) API version information in modsupport.h.
public static final int HAVE_NANOSLEEP = 1;

/* Define to 1 if you have the <ncurses.h> header file. */
public static final int HAVE_NCURSES_H = 1;
/* #undef HAVE_NCURSES_H */

/* Define to 1 if you have the <ndbm.h> header file. */
public static final int HAVE_NDBM_H = 1;
Expand Down Expand Up @@ -1549,7 +1552,7 @@ There is also (independent) API version information in modsupport.h.
public static final int HAVE_TERMIOS_H = 1;

/* Define to 1 if you have the <term.h> header file. */
public static final int HAVE_TERM_H = 1;
/* #undef HAVE_TERM_H */

/* Define to 1 if you have the `timegm' function. */
public static final int HAVE_TIMEGM = 1;
Expand Down Expand Up @@ -1685,7 +1688,7 @@ There is also (independent) API version information in modsupport.h.
public static final int MAJOR_IN_SYSMACROS = 1;

/* Define if mvwdelch in curses.h is an expression. */
public static final int MVWDELCH_IS_EXPRESSION = 1;
/* #undef MVWDELCH_IS_EXPRESSION */

/* Define to the address where bug reports for this package should be sent. */
/* #undef PACKAGE_BUGREPORT */
Expand Down Expand Up @@ -1866,7 +1869,7 @@ There is also (independent) API version information in modsupport.h.


/* Define if WINDOW in curses.h offers a field _flags. */
public static final int WINDOW_HAS_FLAGS = 1;
/* #undef WINDOW_HAS_FLAGS */

/* Define if you want build the _decimal module using a coroutine-local rather
than a thread-local context */
Expand Down Expand Up @@ -11406,11 +11409,13 @@ public static native int PyArg_ParseTupleAndKeywords(PyObject arg0, PyObject arg
@NoException public static native PyObject Py_VaBuildValue(@Cast("const char*") BytePointer arg0, @ByVal @Cast("va_list*") Pointer arg1);
@NoException public static native PyObject Py_VaBuildValue(String arg0, @ByVal @Cast("va_list*") Pointer arg1);

// #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030a0000
// Add an attribute with name 'name' and value 'obj' to the module 'mod.
// On success, return 0 on success.
// On error, raise an exception and return -1.
@NoException public static native int PyModule_AddObjectRef(PyObject mod, @Cast("const char*") BytePointer name, PyObject value);
@NoException public static native int PyModule_AddObjectRef(PyObject mod, String name, PyObject value);
// #endif /* Py_LIMITED_API */

// Similar to PyModule_AddObjectRef() but steal a reference to 'obj'
// (Py_DECREF(obj)) on success (if it returns 0).
Expand Down
2 changes: 1 addition & 1 deletion gsl/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 3 additions & 3 deletions gsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -44,12 +44,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>openblas</artifactId>
<version>0.3.23-${project.parent.version}</version>
<version>0.3.24-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions llvm/README.md
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:

* LLVM 17.0.0 http://llvm.org/
* LLVM 17.0.1 http://llvm.org/

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

Expand Down Expand Up @@ -50,7 +50,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.0-1.5.10-SNAPSHOT</version>
<version>17.0.1-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
9 changes: 4 additions & 5 deletions llvm/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

LLVM_VERSION=17.0.0-rc3
LLVM_VERSION2=17.0.0rc3
download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION2.src.tar.xz llvm-project-$LLVM_VERSION2.src.tar.xz
LLVM_VERSION=17.0.1
download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION.src.tar.xz llvm-project-$LLVM_VERSION.src.tar.xz

mkdir -p $PLATFORM
cd $PLATFORM
INSTALL_PATH=`pwd`
echo "Decompressing archives... (ignore any symlink errors)"
tar --totals -xf ../llvm-project-$LLVM_VERSION2.src.tar.xz || true
cd llvm-project-$LLVM_VERSION2.src
tar --totals -xf ../llvm-project-$LLVM_VERSION.src.tar.xz || true
cd llvm-project-$LLVM_VERSION.src
patch -Np1 < ../../../llvm.patch
sedinplace '/find_package(Git/d' llvm/cmake/modules/AddLLVM.cmake llvm/cmake/modules/VersionFromVCS.cmake
sedinplace '/Generating libLLVM is not supported on MSVC/d' llvm/tools/llvm-shlib/CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion llvm/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.0-${project.parent.version}</version>
<version>17.0.1-${project.parent.version}</version>
<name>JavaCPP Presets Platform for LLVM</name>

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

<groupId>org.bytedeco</groupId>
<artifactId>llvm</artifactId>
<version>17.0.0-${project.parent.version}</version>
<version>17.0.1-${project.parent.version}</version>
<name>JavaCPP Presets for LLVM</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion llvm/samples/clang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.0-1.5.10-SNAPSHOT</version>
<version>17.0.1-1.5.10-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion llvm/samples/llvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.0-1.5.10-SNAPSHOT</version>
<version>17.0.1-1.5.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
Loading

0 comments on commit 4958dd0

Please sign in to comment.