Skip to content

Commit

Permalink
* Upgrade presets for LLVM 18.1.4, libffi 3.4.6, TVM 0.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed May 1, 2024
1 parent 7fdf49e commit ab197f9
Show file tree
Hide file tree
Showing 222 changed files with 741 additions and 330 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
* Upgrade presets for FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CPython 3.12.3, NumPy 1.26.4, SciPy 1.13.0, PyTorch 2.2.2 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.0, ONNX Runtime 1.17.3, TVM 0.15.0, and their dependencies
* Upgrade presets for FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CPython 3.12.3, NumPy 1.26.4, SciPy 1.13.0, LLVM 18.1.4, libffi 3.4.6, PyTorch 2.2.2 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.0, ONNX Runtime 1.17.3, TVM 0.16.0, and their dependencies

### January 29, 2024 version 1.5.10
* Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* NumPy 1.26.x https://github.com/numpy/numpy
* SciPy 1.13.x https://github.com/scipy/scipy
* Gym 0.26.x https://github.com/openai/gym
* LLVM 17.0.x http://llvm.org/releases/download.html
* LLVM 18.1.x http://llvm.org/releases/download.html
* libffi 3.4.x https://github.com/libffi/libffi
* libpostal 1.1 https://github.com/openvenues/libpostal
* LibRaw 0.21.x https://www.libraw.org/download
Expand All @@ -234,7 +234,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* ONNX 1.16.x https://github.com/onnx/onnx
* nGraph 0.26.0 https://github.com/NervanaSystems/ngraph
* ONNX Runtime 1.17.x https://github.com/microsoft/onnxruntime
* TVM 0.15.x https://github.com/apache/tvm
* TVM 0.16.x https://github.com/apache/tvm
* Bullet Physics SDK 3.25 https://pybullet.org
* LiquidFun http://google.github.io/liquidfun/
* Qt 5.15.x https://download.qt.io/archive/qt/
Expand Down
6 changes: 3 additions & 3 deletions libffi/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:

* libffi 3.4.4 https://sourceware.org/libffi/
* libffi 3.4.6 https://sourceware.org/libffi/

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

Expand Down Expand Up @@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.libffi</groupId>
<artifactId>simpleexample</artifactId>
<version>1.5.10</version>
<version>1.5.11-SNAPSHOT</version>
<properties>
<exec.mainClass>SimpleExample</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>libffi-platform</artifactId>
<version>3.4.4-1.5.10</version>
<version>3.4.6-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion libffi/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

LIBFFI_VERSION=3.4.4
LIBFFI_VERSION=3.4.6
download https://github.com/libffi/libffi/releases/download/v$LIBFFI_VERSION/libffi-$LIBFFI_VERSION.tar.gz libffi-$LIBFFI_VERSION.tar.gz

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

<groupId>org.bytedeco</groupId>
<artifactId>libffi-platform</artifactId>
<version>3.4.4-${project.parent.version}</version>
<version>3.4.6-${project.parent.version}</version>
<name>JavaCPP Presets Platform for libffi</name>

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

<groupId>org.bytedeco</groupId>
<artifactId>libffi</artifactId>
<version>3.4.4-${project.parent.version}</version>
<version>3.4.6-${project.parent.version}</version>
<name>JavaCPP Presets for libffi</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion libffi/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>libffi-platform</artifactId>
<version>3.4.4-1.5.11-SNAPSHOT</version>
<version>3.4.6-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand All @@ -10,7 +10,6 @@

import static org.bytedeco.libffi.global.ffi.*;

// #endif

@Properties(inherit = org.bytedeco.libffi.presets.ffi.class)
public class Fun_ffi_cif_Pointer_PointerPointer_Pointer extends FunctionPointer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
2 changes: 1 addition & 1 deletion libffi/src/gen/java/org/bytedeco/libffi/ffi_cif.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
2 changes: 1 addition & 1 deletion libffi/src/gen/java/org/bytedeco/libffi/ffi_closure.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
2 changes: 1 addition & 1 deletion libffi/src/gen/java/org/bytedeco/libffi/ffi_java_raw.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
2 changes: 1 addition & 1 deletion libffi/src/gen/java/org/bytedeco/libffi/ffi_raw.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
2 changes: 1 addition & 1 deletion libffi/src/gen/java/org/bytedeco/libffi/ffi_type.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi;

Expand Down
33 changes: 13 additions & 20 deletions libffi/src/gen/java/org/bytedeco/libffi/global/ffi.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.libffi.global;

Expand Down Expand Up @@ -127,8 +127,8 @@ a copy of this software and associated documentation files (the
// Parsed from ffi.h

/* -----------------------------------------------------------------*-C-*-
libffi 3.4.4
- Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
libffi 3.4.6
- Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
- Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -236,13 +236,11 @@ a copy of this software and associated documentation files (the
when using the static version of the library.
Besides, as a workaround, they can define FFI_BUILDING if they
*know* they are going to link with the static library. */
// #if defined _MSC_VER
// #if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
// # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
// # define FFI_API __declspec(dllexport)
// # elif !defined FFI_BUILDING /* Importing libffi.DLL */
// # else /* Importing libffi.DLL */
// # define FFI_API __declspec(dllimport)
// # else /* Building/linking static library */
// # define FFI_API
// # endif
// #else
// # define FFI_API
Expand Down Expand Up @@ -318,11 +316,7 @@ a copy of this software and associated documentation files (the
public static native @ByRef ffi_type ffi_type_float(); public static native void ffi_type_float(ffi_type setter);
public static native @ByRef ffi_type ffi_type_double(); public static native void ffi_type_double(ffi_type setter);
public static native @ByRef ffi_type ffi_type_pointer(); public static native void ffi_type_pointer(ffi_type setter);

// #if 1
public static native @ByRef ffi_type ffi_type_longdouble(); public static native void ffi_type_longdouble(ffi_type setter);
// #else
// #endif

// #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
// #endif
Expand Down Expand Up @@ -403,13 +397,6 @@ public static native void ffi_raw_call(ffi_cif cif,
public static native Pointer ffi_closure_alloc(@Cast("size_t") long size, @Cast("void**") PointerPointer code);
public static native Pointer ffi_closure_alloc(@Cast("size_t") long size, @Cast("void**") @ByPtrPtr Pointer code);
public static native void ffi_closure_free(Pointer arg0);

// #if defined(PA_LINUX) || defined(PA_HPUX)
// #define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
// #define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
// #else
// #define FFI_CLOSURE_PTR(X) (X)
// #define FFI_RESTORE_PTR(X) (X)
// Targeting ../Fun_ffi_cif_Pointer_PointerPointer_Pointer.java


Expand Down Expand Up @@ -463,7 +450,7 @@ public static native void ffi_raw_call(ffi_cif cif,

// #endif /* FFI_CLOSURES */

// #if FFI_GO_CLOSURES
// #ifdef FFI_GO_CLOSURES

// #endif /* FFI_GO_CLOSURES */

Expand Down Expand Up @@ -505,8 +492,14 @@ public static native void ffi_call(ffi_cif cif,
public static native @Cast("ffi_status") int ffi_get_struct_offsets(@Cast("ffi_abi") int abi, ffi_type struct_type,
@Cast("size_t*") SizeTPointer offsets);

/* Useful for eliminating compiler warnings. */
/* Convert between closure and function pointers. */
// #if defined(PA_LINUX) || defined(PA_HPUX)
// #define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
// #define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
// #else
// #define FFI_FN(f) ((void (*)(void))f)
// #define FFI_CL(f) ((void *)(f))
// #endif

/* ---- Definitions shared with assembly code ---------------------------- */

Expand Down
6 changes: 3 additions & 3 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.6 http://llvm.org/
* LLVM 18.1.4 http://llvm.org/

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

Expand Down Expand Up @@ -42,15 +42,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.llvm</groupId>
<artifactId>Factorial</artifactId>
<version>1.5.10</version>
<version>1.5.11-SNAPSHOT</version>
<properties>
<exec.mainClass>Factorial</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.6-1.5.10</version>
<version>18.1.4-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion llvm/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
exit
fi

LLVM_VERSION=17.0.6
LLVM_VERSION=18.1.4
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
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.6-${project.parent.version}</version>
<version>18.1.4-${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.6-${project.parent.version}</version>
<version>18.1.4-${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.6-1.5.11-SNAPSHOT</version>
<version>18.1.4-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions llvm/samples/llvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.6-1.5.11-SNAPSHOT</version>
<version>18.1.4-1.5.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>libffi-platform</artifactId>
<version>3.4.4-1.5.11-SNAPSHOT</version>
<version>3.4.6-1.5.11-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
Expand Down
4 changes: 2 additions & 2 deletions llvm/samples/polly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>llvm-platform</artifactId>
<version>17.0.6-1.5.11-SNAPSHOT</version>
<version>18.1.4-1.5.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>libffi-platform</artifactId>
<version>3.4.4-1.5.11-SNAPSHOT</version>
<version>3.4.6-1.5.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.llvm.LLVM;

Expand Down
Loading

0 comments on commit ab197f9

Please sign in to comment.