diff --git a/.geminiignore b/.geminiignore index 34e35ae..5a4f3d0 100644 --- a/.geminiignore +++ b/.geminiignore @@ -4,3 +4,4 @@ build/ cmake-build-debug/ *.log models/ +native-binaries/ diff --git a/.github/docker/Dockerfile.builder b/.github/docker/Dockerfile.builder new file mode 100644 index 0000000..7adfdca --- /dev/null +++ b/.github/docker/Dockerfile.builder @@ -0,0 +1,41 @@ +FROM ubuntu:24.04 + +ENV DEBIAN_FRONTEND=noninteractive +ENV JAVA_HOME=/usr/local/jdk-22 +ENV PATH=${JAVA_HOME}/bin:${PATH} + +# Install core system toolchain, build dependencies, ccache, and Vulkan development headers +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + gcc \ + g++ \ + clang \ + cmake \ + ninja-build \ + ccache \ + git \ + curl \ + wget \ + ca-certificates \ + pkg-config \ + libvulkan-dev \ + vulkan-tools \ + mesa-vulkan-drivers \ + glslc \ + libshaderc-dev \ + nvidia-cuda-toolkit \ + && rm -rf /var/lib/apt/lists/* + +# Install OpenJDK 22 for Project Panama (FFM) Java 22+ API compatibility +RUN wget -q https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.tar.gz -O /tmp/jdk22.tar.gz \ + && mkdir -p /usr/local/jdk-22 \ + && tar -xzf /tmp/jdk22.tar.gz -C /usr/local/jdk-22 --strip-components=1 \ + && rm /tmp/jdk22.tar.gz + +# Configure global ccache directory +ENV CCACHE_DIR=/root/.cache/ccache +RUN mkdir -p ${CCACHE_DIR} + +WORKDIR /workspace + +CMD ["/bin/bash"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..42cfb88 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,195 @@ +name: Continuous Integration Matrix + +on: + push: + branches: + - '*' + pull_request: + branches: + - main + workflow_dispatch: + + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + # ========================================================================= + # 1. Linux Compilation & Testing Matrix + # ========================================================================= + build-test-linux: + name: Linux (${{ matrix.target }}) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - target: cpu + cmake_flags: "-DGGML_CUDA=OFF -DGGML_METAL=OFF" + - target: cuda + cmake_flags: "-DGGML_CUDA=ON -DGGML_METAL=OFF" + - target: rocm + cmake_flags: "-DGGML_CUDA=OFF -DGGML_METAL=OFF" + - target: vulkan + cmake_flags: "-DGGML_CUDA=OFF -DGGML_VULKAN=ON" + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up Java 22 (Panama FFM) + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '22' + + - name: Install System Build Dependencies + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential cmake ninja-build ccache \ + libvulkan-dev vulkan-tools mesa-vulkan-drivers glslc libshaderc-dev nvidia-cuda-toolkit + + + - name: Set up ccache + uses: actions/cache@v4 + with: + path: ~/.cache/ccache + key: ${{ runner.os }}-linux-${{ matrix.target }}-ccache-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-linux-${{ matrix.target }}-ccache- + + - name: Configure CMake + run: | + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DARGUS_PORTABLE=ON \ + ${{ matrix.cmake_flags }} + + - name: Compile Native Binary + run: | + cmake --build build --config Release -j $(nproc) + + - name: Execute C++ Unit Tests + run: | + ./build/bin/test_libargus + + - name: Execute JUnit Panama FFM Integration Tests + run: | + ./gradlew test --info + + # ========================================================================= + # 2. Windows MSVC Compilation & Testing Matrix + # ========================================================================= + build-test-windows: + name: Windows (${{ matrix.target }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - target: cpu + os: windows-latest + cmake_flags: "-DGGML_CUDA=OFF" + - target: cuda + os: windows-2022 + cmake_flags: "-DGGML_CUDA=ON -DCMAKE_CUDA_FLAGS=-allow-unsupported-compiler" + - target: vulkan + os: windows-latest + cmake_flags: "-DGGML_CUDA=OFF -DGGML_VULKAN=ON" + + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up Java 22 (Panama FFM) + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '22' + + - name: Set up MSVC Developer Environment + uses: ilammy/msvc-dev-cmd@v1 + + - name: Set up CUDA Toolkit (Windows) + if: matrix.target == 'cuda' + uses: Jimver/cuda-toolkit@v0.2.19 + with: + cuda: '12.4.1' + method: 'network' + + - name: Set up Vulkan SDK (Windows) + if: matrix.target == 'vulkan' + run: | + choco install vulkan-sdk -y + VULKAN_DIR=$(ls -d /c/VulkanSDK/* | tail -n 1) + echo "VULKAN_SDK=$VULKAN_DIR" >> $GITHUB_ENV + echo "$VULKAN_DIR/Bin" >> $GITHUB_PATH + + + - name: Configure CMake (Ninja) + run: | + cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} + + + - name: Compile Native Binary (Release) + run: | + cmake --build build --config Release -j 4 + + - name: Execute C++ Unit Tests + run: | + .\build\bin\Release\test_libargus.exe + + - name: Execute JUnit Panama FFM Integration Tests + run: | + .\gradlew.bat test --info + + # ========================================================================= + # 3. macOS Apple Silicon Compilation & Testing Matrix + # ========================================================================= + build-test-macos: + name: macOS Arm64 Metal + runs-on: macos-14 + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up Java 22 (Panama FFM) + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '22' + + - name: Install ccache + run: | + brew install ccache ninja + + - name: Set up ccache + uses: actions/cache@v4 + with: + path: ~/.cache/ccache + key: ${{ runner.os }}-macos-metal-ccache-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-macos-metal-ccache- + + - name: Configure CMake (Metal) + run: | + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DGGML_METAL=ON \ + -DGGML_CUDA=OFF + + - name: Compile Native Binary + run: | + cmake --build build --config Release -j $(sysctl -n hw.ncpu) + + - name: Execute C++ Unit Tests + run: | + ./build/bin/test_libargus + + - name: Execute JUnit Panama FFM Integration Tests + run: | + ./gradlew test --info diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml new file mode 100644 index 0000000..9d6daa5 --- /dev/null +++ b/.github/workflows/docker-builder.yml @@ -0,0 +1,51 @@ +name: Build & Publish GHCR Builder Image + +on: + push: + branches: + - '*' + paths: + - '.github/docker/Dockerfile.builder' + - '.github/workflows/docker-builder.yml' + workflow_dispatch: + + +permissions: + contents: read + packages: write + +jobs: + build-and-push: + name: Build & Push GHCR Docker Builder Image + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Downcase Image Repository Name + id: image_name + run: | + echo "IMAGE_ID=ghcr.io/${{ github.repository_owner }}/libargus-builder" | tr '[:upper:]' '[:lower:]' >> $GITHUB_ENV + + - name: Build and Push Docker Image + uses: docker/build-push-action@v6 + with: + context: . + file: .github/docker/Dockerfile.builder + push: true + tags: | + ${{ env.IMAGE_ID }}:latest + ${{ env.IMAGE_ID }}:${{ github.sha }} + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..eb60ac7 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,206 @@ +name: Release & Deployment Pipeline + +on: + push: + tags: + - 'v*' + workflow_dispatch: + inputs: + version: + description: 'Release Version (e.g. 1.4.2)' + required: true + default: '1.4.2' + +permissions: + contents: write + packages: write + +jobs: + # ========================================================================= + # 1. Build Cross-Platform Native Shared Libraries + # ========================================================================= + build-native-artifacts: + name: Build Native Artifacts (${{ matrix.platform }}-${{ matrix.target }}) + runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash + strategy: + fail-fast: false + matrix: + include: + - platform: linux-x86_64 + target: cpu + os: ubuntu-latest + cmake_flags: "-DGGML_CUDA=OFF -DGGML_METAL=OFF" + - platform: linux-x86_64 + target: cuda + os: ubuntu-latest + cmake_flags: "-DGGML_CUDA=ON -DGGML_METAL=OFF" + - platform: linux-x86_64 + target: rocm + os: ubuntu-latest + cmake_flags: "-DGGML_CUDA=OFF -DGGML_METAL=OFF" + - platform: linux-x86_64 + target: vulkan + os: ubuntu-latest + cmake_flags: "-DGGML_CUDA=OFF -DGGML_VULKAN=ON" + - platform: windows-x86_64 + target: cpu + os: windows-latest + cmake_flags: "-DGGML_CUDA=OFF" + - platform: windows-x86_64 + target: cuda + os: windows-2022 + cmake_flags: "-DGGML_CUDA=ON -DCMAKE_CUDA_FLAGS=-allow-unsupported-compiler" + + - platform: windows-x86_64 + target: vulkan + os: windows-latest + cmake_flags: "-DGGML_CUDA=OFF -DGGML_VULKAN=ON" + - platform: macos-aarch64 + target: metal + os: macos-14 + cmake_flags: "-DGGML_METAL=ON -DGGML_CUDA=OFF" + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up System Dependencies (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + build-essential cmake ninja-build libvulkan-dev vulkan-tools mesa-vulkan-drivers glslc libshaderc-dev nvidia-cuda-toolkit + + + - name: Set up MSVC Developer Environment + if: runner.os == 'Windows' + uses: ilammy/msvc-dev-cmd@v1 + + - name: Set up CUDA Toolkit (Windows) + if: runner.os == 'Windows' && matrix.target == 'cuda' + uses: Jimver/cuda-toolkit@v0.2.19 + with: + cuda: '12.4.1' + method: 'network' + + - name: Set up Vulkan SDK (Windows) + if: runner.os == 'Windows' && matrix.target == 'vulkan' + run: | + choco install vulkan-sdk -y + VULKAN_DIR=$(ls -d /c/VulkanSDK/* | tail -n 1) + echo "VULKAN_SDK=$VULKAN_DIR" >> $GITHUB_ENV + echo "$VULKAN_DIR/Bin" >> $GITHUB_PATH + + + - name: Configure CMake + run: | + cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DARGUS_PORTABLE=ON ${{ matrix.cmake_flags }} + + + - name: Compile Native Binary + run: | + cmake --build build --config Release -j 4 + + - name: Upload Native Binary Artifact + uses: actions/upload-artifact@v4 + with: + name: native-${{ matrix.platform }}-${{ matrix.target }} + path: | + build/lib/libargus.so + build/lib/argus.dll + build/bin/Release/argus.dll + build/lib/libargus.dylib + if-no-files-found: ignore + + # ========================================================================= + # 2. Package Java Modular Classifier Jars & Create GitHub Release + # ========================================================================= + publish-release: + name: Package Jars & Publish Release + needs: build-native-artifacts + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up Java 22 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '22' + + - name: Download All Compiled Native Artifacts + uses: actions/download-artifact@v4 + with: + path: native-binaries + + - name: Copy Downloaded Native Libraries to Fine-Grained Subproject Resource Directories + run: | + mkdir -p bindings/java/native-linux-cpu/src/main/resources/natives/linux-amd64/cpu/ + mkdir -p bindings/java/native-windows-cpu/src/main/resources/natives/windows-amd64/cpu/ + mkdir -p bindings/java/native-linux-cuda/src/main/resources/natives/linux-amd64/cuda/ + mkdir -p bindings/java/native-windows-cuda/src/main/resources/natives/windows-amd64/cuda/ + mkdir -p bindings/java/native-linux-rocm/src/main/resources/natives/linux-amd64/rocm/ + mkdir -p bindings/java/native-linux-vulkan/src/main/resources/natives/linux-amd64/vulkan/ + mkdir -p bindings/java/native-windows-vulkan/src/main/resources/natives/windows-amd64/vulkan/ + mkdir -p bindings/java/native-macos-metal/src/main/resources/natives/macos-aarch64/metal/ + + [ -f native-binaries/native-linux-x86_64-cpu/libargus.so ] && cp native-binaries/native-linux-x86_64-cpu/libargus.so bindings/java/native-linux-cpu/src/main/resources/natives/linux-amd64/cpu/ || true + [ -f native-binaries/native-windows-x86_64-cpu/argus.dll ] && cp native-binaries/native-windows-x86_64-cpu/argus.dll bindings/java/native-windows-cpu/src/main/resources/natives/windows-amd64/cpu/ || true + + [ -f native-binaries/native-linux-x86_64-cuda/libargus.so ] && cp native-binaries/native-linux-x86_64-cuda/libargus.so bindings/java/native-linux-cuda/src/main/resources/natives/linux-amd64/cuda/ || true + [ -f native-binaries/native-windows-x86_64-cuda/argus.dll ] && cp native-binaries/native-windows-x86_64-cuda/argus.dll bindings/java/native-windows-cuda/src/main/resources/natives/windows-amd64/cuda/ || true + + [ -f native-binaries/native-linux-x86_64-rocm/libargus.so ] && cp native-binaries/native-linux-x86_64-rocm/libargus.so bindings/java/native-linux-rocm/src/main/resources/natives/linux-amd64/rocm/ || true + + [ -f native-binaries/native-linux-x86_64-vulkan/libargus.so ] && cp native-binaries/native-linux-x86_64-vulkan/libargus.so bindings/java/native-linux-vulkan/src/main/resources/natives/linux-amd64/vulkan/ || true + [ -f native-binaries/native-windows-x86_64-vulkan/argus.dll ] && cp native-binaries/native-windows-x86_64-vulkan/argus.dll bindings/java/native-windows-vulkan/src/main/resources/natives/windows-amd64/vulkan/ || true + + [ -f native-binaries/native-macos-aarch64-metal/libargus.dylib ] && cp native-binaries/native-macos-aarch64-metal/libargus.dylib bindings/java/native-macos-metal/src/main/resources/natives/macos-aarch64/metal/ || true + + - name: Build Java Core & Native Classifier Jars + run: | + ./gradlew build --info + + - name: Publish to GitHub Packages Maven Registry + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./gradlew publishAllPublicationsToGitHubPackagesRepository --info || { + echo "::warning::Publishing to GitHub Packages failed (likely already published). Continuing release pipeline..." + } + + - name: Publish to Maven Central (Sonatype Central Portal) + env: + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: | + if [ -z "$MAVEN_CENTRAL_USERNAME" ] || [ -z "$MAVEN_CENTRAL_PASSWORD" ]; then + echo "::warning::MAVEN_CENTRAL_USERNAME or MAVEN_CENTRAL_PASSWORD is not set. Skipping Maven Central publication." + else + ./gradlew publishAggregationToCentralPortal \ + -PmavenCentralUsername="$MAVEN_CENTRAL_USERNAME" \ + -PmavenCentralPassword="$MAVEN_CENTRAL_PASSWORD" \ + --info + fi + + + + - name: Create GitHub Tagged Release + uses: softprops/action-gh-release@v2 + with: + files: | + bindings/java/core/build/libs/*.jar + bindings/java/native-*/build/libs/*.jar + native-binaries/**/* + draft: false + prerelease: false + generate_release_notes: true + diff --git a/.gitignore b/.gitignore index 0def259..7473179 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,13 @@ # Build Folders /build /cmake-build-debug -/gradle /bindings/java/*/.gradle /bindings/java/*/build -gradlew -gradlew.bat .idea .gradle + models media diff --git a/CMakeLists.txt b/CMakeLists.txt index 85c64f3..abd0874 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,15 @@ if(GGML_CUDA) # Enable explicit compiler optimizations for target GPU architectures set(CMAKE_CUDA_STANDARD 17) set(CMAKE_CUDA_STANDARD_REQUIRED ON) + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) + # Target Turing (7.5), Ampere (8.0, 8.6), Ada Lovelace (8.9), Hopper (9.0) + 90-virtual PTX fallback + set(CMAKE_CUDA_ARCHITECTURES "75-real;80-real;86-real;89-real;90-real;90-virtual") + endif() + + endif() + if(GGML_METAL) add_compile_definitions(GGML_USE_METAL) endif() @@ -57,7 +64,6 @@ FetchContent_Declare( llamacpp GIT_REPOSITORY https://github.com/ggml-org/llama.cpp.git GIT_TAG 657e01125aa49577a62a5531fde24cbcc007006d - GIT_SHALLOW TRUE # Enforces automatic depth-1 shallow checkout passes ) # Fetch core whisper.cpp framework layer @@ -65,9 +71,9 @@ FetchContent_Declare( whispercpp GIT_REPOSITORY https://github.com/ggml-org/whisper.cpp.git GIT_TAG 080bbbe85230f624f0b52127f1ae1218247989f9 - GIT_SHALLOW TRUE ) + # Make components available sequentially; whisper automatically inherits the # pre-existing initialized 'ggml' targets exposed by the llama subproject FetchContent_MakeAvailable(llamacpp whispercpp) diff --git a/README.md b/README.md index 0729212..3f34452 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ # libargus ## An unmanaged, zero-allocation native AI execution runtime consolidating Vision, Speech, and LLM compute pipelines behind a single Project Panama FFM boundary. + +[![CI Matrix](https://github.com/ProjectArgus-cc/libargus.cc/actions/workflows/ci.yml/badge.svg)](https://github.com/ProjectArgus-cc/libargus.cc/actions/workflows/ci.yml) +[![Maven Central](https://img.shields.io/maven-central/v/cc.projectargus/libargus-core.svg?label=Maven%20Central&color=blue)](https://central.sonatype.com/artifact/cc.projectargus/libargus-core) +[![JDK Target](https://img.shields.io/badge/JDK-22%2B%20Panama%20FFM-orange.svg)](https://openjdk.org/jeps/454) +[![C++ Standard](https://img.shields.io/badge/C%2B%2B-17-blue.svg)](https://en.cppreference.com/w/cpp/17) +[![License](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) + > [!NOTE] -> **v1.4.1 Stable — Dynamic Context CPU Thread Scaling & Governor API** -> +> **v1.4.2 Stable — Dynamic Context CPU Thread Scaling & Governor API** +> + `libargus` is an ultra-lean, high-performance, model-agnostic inference wrapper engineered to consolidate LLM text generation, Whisper-based speech-to-text (ASR), Speech-LLM text-to-speech (TTS), and **bleeding-edge Multimodal (Vision, Audio, and Video) encoding and evaluation** pipelines into a single process-global native execution runtime. @@ -349,7 +357,7 @@ This hybrid methodology treats AI not as an unguided code generator, but as an a `libargus` is engineered strictly as **Layer 0 (The Core Execution Bedrock)** for low-latency, performance-critical JVM platforms. It provides the raw compute foundation required for zero-allocation native tensor orchestration via Project Panama. -This engine serves as the high-throughput infrastructure for a broader cognitive platform. To view the high-level roadmap detailing how this runtime block interfaces with the upcoming Layer 1 stateful cognitive core (L-TABB) and the unified system dashboard, visit the master project organization landing page at [ProjectArgus.cc](https://github.com/projectargus-cc). +This engine serves as the high-throughput infrastructure for a broader cognitive platform. To view the high-level roadmap detailing how this runtime block interfaces with the upcoming Layer 1 stateful cognitive core (L-TABB) and the unified system dashboard, visit the master project organization landing page at [ProjectArgus.cc](https://github.com/ProjectArgus-cc). --- diff --git a/bindings/java/core/build.gradle.kts b/bindings/java/core/build.gradle.kts index 2b0a74a..ccabf35 100644 --- a/bindings/java/core/build.gradle.kts +++ b/bindings/java/core/build.gradle.kts @@ -2,7 +2,12 @@ plugins { `java-library` } +base { + archivesName.set("libargus-core") +} + group = "cc.projectargus" + val versionFile = file("${project.rootDir}/version.txt") version = versionFile.readText().trim() @@ -40,6 +45,10 @@ tasks.processResources { dependsOn(copyVersionFile) } +tasks.named("sourcesJar") { + dependsOn(copyVersionFile) +} + tasks.test { dependsOn(":compileCMake") useJUnitPlatform() diff --git a/bindings/java/core/src/main/java/cc/projectargus/libargus/ArgusAudioContext.java b/bindings/java/core/src/main/java/cc/projectargus/libargus/ArgusAudioContext.java index c103d92..97dcb02 100644 --- a/bindings/java/core/src/main/java/cc/projectargus/libargus/ArgusAudioContext.java +++ b/bindings/java/core/src/main/java/cc/projectargus/libargus/ArgusAudioContext.java @@ -63,8 +63,9 @@ public static ArgusAudioContext init(Arena arena, String whisperModelPath, int c * Synchronously transcribes a float PCM buffer containing 16kHz audio samples. * Mutex-locked inside the native layer to prevent concurrency issues. * - * @param pcmData audio float data normalized to [-1.0, 1.0] (16kHz sampling rate) - * @param maxChars maximum output character capacity to allocate off-heap + * @param pcmSeg audio float data normalized to [-1.0, 1.0] (16kHz sampling rate) + * @param sampleCount number of float samples in the PCM buffer + * @param maxChars maximum output character capacity to allocate off-heap * @return transcribed text string */ public String transcribe(MemorySegment pcmSeg, int sampleCount, int maxChars) { diff --git a/bindings/java/core/src/test/java/cc/projectargus/libargus/ArgusBindingsTest.java b/bindings/java/core/src/test/java/cc/projectargus/libargus/ArgusBindingsTest.java index 460398f..6c03eb4 100644 --- a/bindings/java/core/src/test/java/cc/projectargus/libargus/ArgusBindingsTest.java +++ b/bindings/java/core/src/test/java/cc/projectargus/libargus/ArgusBindingsTest.java @@ -262,13 +262,13 @@ public void testCustomNativeDirExtraction() { @Test public void testLibraryVersionAssertion() { System.out.println("[Java Test] Validating compiled native library version..."); - assertEquals("1.4.1", ArgusBindings.VERSION); + assertEquals("1.4.2", ArgusBindings.VERSION); try { MemorySegment verPtr = (MemorySegment) ArgusBindings.argus_version.invokeExact(); assertNotNull(verPtr); assertFalse(verPtr.equals(MemorySegment.NULL)); String nativeVer = verPtr.reinterpret(Long.MAX_VALUE).getString(0); - assertEquals("1.4.1", nativeVer); + assertEquals("1.4.2", nativeVer); System.out.println("[Java Test] Java static version matches native compiled version: " + nativeVer); } catch (Throwable t) { fail("Failed to verify native version: " + t.getMessage()); diff --git a/bindings/java/native-linux-cpu/build.gradle.kts b/bindings/java/native-linux-cpu/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-linux-cpu/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-linux-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/LinuxCpuNativeProvider.java b/bindings/java/native-linux-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/LinuxCpuNativeProvider.java new file mode 100644 index 0000000..efc381d --- /dev/null +++ b/bindings/java/native-linux-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/LinuxCpuNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.cpu; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class LinuxCpuNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "linux"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "cpu"; + } + + @Override + public int getPriority() { + return 10; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/linux-amd64/cpu/libargus.so"); + } + + @Override + public String getLibraryName() { + return "libargus.so"; + } +} diff --git a/bindings/java/native-linux-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-linux-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..fae15df --- /dev/null +++ b/bindings/java/native-linux-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.cpu.LinuxCpuNativeProvider diff --git a/bindings/java/native-linux-cuda/build.gradle.kts b/bindings/java/native-linux-cuda/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-linux-cuda/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-linux-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/LinuxCudaNativeProvider.java b/bindings/java/native-linux-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/LinuxCudaNativeProvider.java new file mode 100644 index 0000000..108366a --- /dev/null +++ b/bindings/java/native-linux-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/LinuxCudaNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.cuda; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class LinuxCudaNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "linux"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "cuda"; + } + + @Override + public int getPriority() { + return 100; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/linux-amd64/cuda/libargus.so"); + } + + @Override + public String getLibraryName() { + return "libargus.so"; + } +} diff --git a/bindings/java/native-linux-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-linux-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..613c251 --- /dev/null +++ b/bindings/java/native-linux-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.cuda.LinuxCudaNativeProvider diff --git a/bindings/java/native-linux-rocm/build.gradle.kts b/bindings/java/native-linux-rocm/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-linux-rocm/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-linux-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/LinuxRocmNativeProvider.java b/bindings/java/native-linux-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/LinuxRocmNativeProvider.java new file mode 100644 index 0000000..dd53c00 --- /dev/null +++ b/bindings/java/native-linux-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/LinuxRocmNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.rocm; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class LinuxRocmNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "linux"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "rocm"; + } + + @Override + public int getPriority() { + return 90; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/linux-amd64/rocm/libargus.so"); + } + + @Override + public String getLibraryName() { + return "libargus.so"; + } +} diff --git a/bindings/java/native-linux-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-linux-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..173f6c8 --- /dev/null +++ b/bindings/java/native-linux-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.rocm.LinuxRocmNativeProvider diff --git a/bindings/java/native-linux-vulkan/build.gradle.kts b/bindings/java/native-linux-vulkan/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-linux-vulkan/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-linux-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/LinuxVulkanNativeProvider.java b/bindings/java/native-linux-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/LinuxVulkanNativeProvider.java new file mode 100644 index 0000000..274001b --- /dev/null +++ b/bindings/java/native-linux-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/LinuxVulkanNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.vulkan; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class LinuxVulkanNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "linux"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "vulkan"; + } + + @Override + public int getPriority() { + return 80; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/linux-amd64/vulkan/libargus.so"); + } + + @Override + public String getLibraryName() { + return "libargus.so"; + } +} diff --git a/bindings/java/native-linux-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-linux-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..ab7046a --- /dev/null +++ b/bindings/java/native-linux-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.vulkan.LinuxVulkanNativeProvider diff --git a/bindings/java/native-macos-metal/build.gradle.kts b/bindings/java/native-macos-metal/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-macos-metal/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-macos-metal/src/main/java/cc/projectargus/libargus/platform/metal/MacosMetalNativeProvider.java b/bindings/java/native-macos-metal/src/main/java/cc/projectargus/libargus/platform/metal/MacosMetalNativeProvider.java new file mode 100644 index 0000000..506fc3b --- /dev/null +++ b/bindings/java/native-macos-metal/src/main/java/cc/projectargus/libargus/platform/metal/MacosMetalNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.metal; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class MacosMetalNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "macos"; + } + + @Override + public String getArch() { + return "aarch64"; + } + + @Override + public String getBackend() { + return "metal"; + } + + @Override + public int getPriority() { + return 100; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/macos-aarch64/metal/libargus.dylib"); + } + + @Override + public String getLibraryName() { + return "libargus.dylib"; + } +} diff --git a/bindings/java/native-macos-metal/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-macos-metal/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..b68b737 --- /dev/null +++ b/bindings/java/native-macos-metal/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.metal.MacosMetalNativeProvider diff --git a/bindings/java/native-windows-cpu/build.gradle.kts b/bindings/java/native-windows-cpu/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-windows-cpu/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-windows-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/WindowsCpuNativeProvider.java b/bindings/java/native-windows-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/WindowsCpuNativeProvider.java new file mode 100644 index 0000000..ce82cb7 --- /dev/null +++ b/bindings/java/native-windows-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/WindowsCpuNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.cpu; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class WindowsCpuNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "windows"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "cpu"; + } + + @Override + public int getPriority() { + return 10; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/windows-amd64/cpu/argus.dll"); + } + + @Override + public String getLibraryName() { + return "argus.dll"; + } +} diff --git a/bindings/java/native-windows-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-windows-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..c8b83b9 --- /dev/null +++ b/bindings/java/native-windows-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.cpu.WindowsCpuNativeProvider diff --git a/bindings/java/native-windows-cuda/build.gradle.kts b/bindings/java/native-windows-cuda/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-windows-cuda/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-windows-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/WindowsCudaNativeProvider.java b/bindings/java/native-windows-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/WindowsCudaNativeProvider.java new file mode 100644 index 0000000..5f958cb --- /dev/null +++ b/bindings/java/native-windows-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/WindowsCudaNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.cuda; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class WindowsCudaNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "windows"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "cuda"; + } + + @Override + public int getPriority() { + return 100; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/windows-amd64/cuda/argus.dll"); + } + + @Override + public String getLibraryName() { + return "argus.dll"; + } +} diff --git a/bindings/java/native-windows-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-windows-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..f314fc7 --- /dev/null +++ b/bindings/java/native-windows-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.cuda.WindowsCudaNativeProvider diff --git a/bindings/java/native-windows-vulkan/build.gradle.kts b/bindings/java/native-windows-vulkan/build.gradle.kts new file mode 100644 index 0000000..226315e --- /dev/null +++ b/bindings/java/native-windows-vulkan/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + `java-library` +} + +group = "cc.projectargus" +val versionFile = file("${project.rootDir}/version.txt") +version = versionFile.readText().trim() + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + implementation(project(":bindings-java-core")) +} + +sourceSets { + main { + resources { + srcDir(layout.buildDirectory.dir("generated/resources")) + } + } +} diff --git a/bindings/java/native-windows-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/WindowsVulkanNativeProvider.java b/bindings/java/native-windows-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/WindowsVulkanNativeProvider.java new file mode 100644 index 0000000..309bf44 --- /dev/null +++ b/bindings/java/native-windows-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/WindowsVulkanNativeProvider.java @@ -0,0 +1,36 @@ +package cc.projectargus.libargus.platform.vulkan; + +import cc.projectargus.libargus.spi.NativeLibraryProvider; +import java.io.InputStream; + +public final class WindowsVulkanNativeProvider implements NativeLibraryProvider { + @Override + public String getOs() { + return "windows"; + } + + @Override + public String getArch() { + return "amd64"; + } + + @Override + public String getBackend() { + return "vulkan"; + } + + @Override + public int getPriority() { + return 80; + } + + @Override + public InputStream getLibraryStream() { + return getClass().getResourceAsStream("/natives/windows-amd64/vulkan/argus.dll"); + } + + @Override + public String getLibraryName() { + return "argus.dll"; + } +} diff --git a/bindings/java/native-windows-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/native-windows-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider new file mode 100644 index 0000000..49d8592 --- /dev/null +++ b/bindings/java/native-windows-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider @@ -0,0 +1 @@ +cc.projectargus.libargus.platform.vulkan.WindowsVulkanNativeProvider diff --git a/bindings/java/platform-cpu/build.gradle.kts b/bindings/java/platform-cpu/build.gradle.kts deleted file mode 100644 index a3eb538..0000000 --- a/bindings/java/platform-cpu/build.gradle.kts +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - `java-library` -} - -group = "cc.projectargus" -val versionFile = file("${project.rootDir}/version.txt") -version = versionFile.readText().trim() - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } -} - -dependencies { - implementation(project(":bindings-java-core")) -} - -val copyNativeLibrary = tasks.register("copyNativeLibrary") { - dependsOn(":compileCMake") - val osName = System.getProperty("os.name").lowercase() - val osArch = System.getProperty("os.arch").lowercase() - - val osDir = when { - osName.contains("linux") -> "linux-$osArch" - osName.contains("windows") -> "windows-$osArch" - osName.contains("mac") -> "macos-$osArch" - else -> "unknown" - } - - val libExtension = when { - osName.contains("windows") -> "argus.dll" - osName.contains("mac") -> "libargus.dylib" - else -> "libargus.so" - } - - val buildDir = file("${project.rootDir}/build") - from(buildDir) { - include(libExtension) - } - into(layout.buildDirectory.dir("generated/resources/natives/$osDir/cpu")) - - onlyIf { - file("${buildDir}/${libExtension}").exists() - } -} - -sourceSets { - main { - resources { - srcDir(layout.buildDirectory.dir("generated/resources")) - } - } -} - -tasks.processResources { - dependsOn(copyNativeLibrary) -} diff --git a/bindings/java/platform-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/CpuNativeProvider.java b/bindings/java/platform-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/CpuNativeProvider.java deleted file mode 100644 index cf846e1..0000000 --- a/bindings/java/platform-cpu/src/main/java/cc/projectargus/libargus/platform/cpu/CpuNativeProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -package cc.projectargus.libargus.platform.cpu; - -import cc.projectargus.libargus.spi.NativeLibraryProvider; -import java.io.InputStream; - -/** - * Native Library Provider for CPU execution. - */ -public final class CpuNativeProvider implements NativeLibraryProvider { - @Override - public String getOs() { - return System.getProperty("os.name").toLowerCase(); - } - - @Override - public String getArch() { - return System.getProperty("os.arch").toLowerCase(); - } - - @Override - public String getBackend() { - return "cpu"; - } - - @Override - public int getPriority() { - return 10; // CPU backend is the standard baseline - } - - @Override - public InputStream getLibraryStream() { - String osName = getOs(); - String osArch = getArch(); - String osDir; - if (osName.contains("linux")) { - osDir = "linux-" + osArch; - } else if (osName.contains("windows")) { - osDir = "windows-" + osArch; - } else if (osName.contains("mac")) { - osDir = "macos-" + osArch; - } else { - osDir = "unknown"; - } - String libName = getLibraryName(); - return getClass().getResourceAsStream("/natives/" + osDir + "/cpu/" + libName); - } - - @Override - public String getLibraryName() { - String osName = getOs(); - if (osName.contains("windows")) { - return "argus.dll"; - } else if (osName.contains("mac")) { - return "libargus.dylib"; - } else { - return "libargus.so"; - } - } -} diff --git a/bindings/java/platform-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/platform-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider deleted file mode 100644 index a18d806..0000000 --- a/bindings/java/platform-cpu/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider +++ /dev/null @@ -1 +0,0 @@ -cc.projectargus.libargus.platform.cpu.CpuNativeProvider diff --git a/bindings/java/platform-cuda/build.gradle.kts b/bindings/java/platform-cuda/build.gradle.kts deleted file mode 100644 index c5a00f5..0000000 --- a/bindings/java/platform-cuda/build.gradle.kts +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - `java-library` -} - -group = "cc.projectargus" -val versionFile = file("${project.rootDir}/version.txt") -version = versionFile.readText().trim() - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } -} - -dependencies { - implementation(project(":bindings-java-core")) -} - -val copyNativeLibrary = tasks.register("copyNativeLibrary") { - dependsOn(":compileCMake") - val osName = System.getProperty("os.name").lowercase() - val osArch = System.getProperty("os.arch").lowercase() - - val osDir = when { - osName.contains("linux") -> "linux-$osArch" - osName.contains("windows") -> "windows-$osArch" - osName.contains("mac") -> "macos-$osArch" - else -> "unknown" - } - - val libExtension = when { - osName.contains("windows") -> "argus.dll" - osName.contains("mac") -> "libargus.dylib" - else -> "libargus.so" - } - - val buildDir = file("${project.rootDir}/build") - from(buildDir) { - include(libExtension) - } - into(layout.buildDirectory.dir("generated/resources/natives/$osDir/cuda")) - - onlyIf { - file("${buildDir}/${libExtension}").exists() - } -} - -sourceSets { - main { - resources { - srcDir(layout.buildDirectory.dir("generated/resources")) - } - } -} - -tasks.processResources { - dependsOn(copyNativeLibrary) -} diff --git a/bindings/java/platform-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/CudaNativeProvider.java b/bindings/java/platform-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/CudaNativeProvider.java deleted file mode 100644 index a27f124..0000000 --- a/bindings/java/platform-cuda/src/main/java/cc/projectargus/libargus/platform/cuda/CudaNativeProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -package cc.projectargus.libargus.platform.cuda; - -import cc.projectargus.libargus.spi.NativeLibraryProvider; -import java.io.InputStream; - -/** - * Native Library Provider for CUDA execution. - */ -public final class CudaNativeProvider implements NativeLibraryProvider { - @Override - public String getOs() { - return System.getProperty("os.name").toLowerCase(); - } - - @Override - public String getArch() { - return System.getProperty("os.arch").toLowerCase(); - } - - @Override - public String getBackend() { - return "cuda"; - } - - @Override - public int getPriority() { - return 100; // CUDA is high priority - } - - @Override - public InputStream getLibraryStream() { - String osName = getOs(); - String osArch = getArch(); - String osDir; - if (osName.contains("linux")) { - osDir = "linux-" + osArch; - } else if (osName.contains("windows")) { - osDir = "windows-" + osArch; - } else if (osName.contains("mac")) { - osDir = "macos-" + osArch; - } else { - osDir = "unknown"; - } - String libName = getLibraryName(); - return getClass().getResourceAsStream("/natives/" + osDir + "/cuda/" + libName); - } - - @Override - public String getLibraryName() { - String osName = getOs(); - if (osName.contains("windows")) { - return "argus.dll"; - } else if (osName.contains("mac")) { - return "libargus.dylib"; - } else { - return "libargus.so"; - } - } -} diff --git a/bindings/java/platform-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/platform-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider deleted file mode 100644 index 8385fb9..0000000 --- a/bindings/java/platform-cuda/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider +++ /dev/null @@ -1 +0,0 @@ -cc.projectargus.libargus.platform.cuda.CudaNativeProvider diff --git a/bindings/java/platform-rocm/build.gradle.kts b/bindings/java/platform-rocm/build.gradle.kts deleted file mode 100644 index b55dd7c..0000000 --- a/bindings/java/platform-rocm/build.gradle.kts +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - `java-library` -} - -group = "cc.projectargus" -val versionFile = file("${project.rootDir}/version.txt") -version = versionFile.readText().trim() - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } -} - -dependencies { - implementation(project(":bindings-java-core")) -} - -val copyNativeLibrary = tasks.register("copyNativeLibrary") { - dependsOn(":compileCMake") - val osName = System.getProperty("os.name").lowercase() - val osArch = System.getProperty("os.arch").lowercase() - - val osDir = when { - osName.contains("linux") -> "linux-$osArch" - osName.contains("windows") -> "windows-$osArch" - osName.contains("mac") -> "macos-$osArch" - else -> "unknown" - } - - val libExtension = when { - osName.contains("windows") -> "argus.dll" - osName.contains("mac") -> "libargus.dylib" - else -> "libargus.so" - } - - val buildDir = file("${project.rootDir}/build") - from(buildDir) { - include(libExtension) - } - into(layout.buildDirectory.dir("generated/resources/natives/$osDir/rocm")) - - onlyIf { - file("${buildDir}/${libExtension}").exists() - } -} - -sourceSets { - main { - resources { - srcDir(layout.buildDirectory.dir("generated/resources")) - } - } -} - -tasks.processResources { - dependsOn(copyNativeLibrary) -} diff --git a/bindings/java/platform-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/RocmNativeProvider.java b/bindings/java/platform-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/RocmNativeProvider.java deleted file mode 100644 index 1f00c8f..0000000 --- a/bindings/java/platform-rocm/src/main/java/cc/projectargus/libargus/platform/rocm/RocmNativeProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -package cc.projectargus.libargus.platform.rocm; - -import cc.projectargus.libargus.spi.NativeLibraryProvider; -import java.io.InputStream; - -/** - * Native Library Provider for ROCm/HIP execution. - */ -public final class RocmNativeProvider implements NativeLibraryProvider { - @Override - public String getOs() { - return System.getProperty("os.name").toLowerCase(); - } - - @Override - public String getArch() { - return System.getProperty("os.arch").toLowerCase(); - } - - @Override - public String getBackend() { - return "rocm"; - } - - @Override - public int getPriority() { - return 90; // ROCm is high priority, just under CUDA - } - - @Override - public InputStream getLibraryStream() { - String osName = getOs(); - String osArch = getArch(); - String osDir; - if (osName.contains("linux")) { - osDir = "linux-" + osArch; - } else if (osName.contains("windows")) { - osDir = "windows-" + osArch; - } else if (osName.contains("mac")) { - osDir = "macos-" + osArch; - } else { - osDir = "unknown"; - } - String libName = getLibraryName(); - return getClass().getResourceAsStream("/natives/" + osDir + "/rocm/" + libName); - } - - @Override - public String getLibraryName() { - String osName = getOs(); - if (osName.contains("windows")) { - return "argus.dll"; - } else if (osName.contains("mac")) { - return "libargus.dylib"; - } else { - return "libargus.so"; - } - } -} diff --git a/bindings/java/platform-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/platform-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider deleted file mode 100644 index 010e28c..0000000 --- a/bindings/java/platform-rocm/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider +++ /dev/null @@ -1 +0,0 @@ -cc.projectargus.libargus.platform.rocm.RocmNativeProvider diff --git a/bindings/java/platform-vulkan/build.gradle.kts b/bindings/java/platform-vulkan/build.gradle.kts deleted file mode 100644 index 720122d..0000000 --- a/bindings/java/platform-vulkan/build.gradle.kts +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - `java-library` -} - -group = "cc.projectargus" -val versionFile = file("${project.rootDir}/version.txt") -version = versionFile.readText().trim() - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } -} - -dependencies { - implementation(project(":bindings-java-core")) -} - -val copyNativeLibrary = tasks.register("copyNativeLibrary") { - dependsOn(":compileCMake") - val osName = System.getProperty("os.name").lowercase() - val osArch = System.getProperty("os.arch").lowercase() - - val osDir = when { - osName.contains("linux") -> "linux-$osArch" - osName.contains("windows") -> "windows-$osArch" - osName.contains("mac") -> "macos-$osArch" - else -> "unknown" - } - - val libExtension = when { - osName.contains("windows") -> "argus.dll" - osName.contains("mac") -> "libargus.dylib" - else -> "libargus.so" - } - - val buildDir = file("${project.rootDir}/build") - from(buildDir) { - include(libExtension) - } - into(layout.buildDirectory.dir("generated/resources/natives/$osDir/vulkan")) - - onlyIf { - file("${buildDir}/${libExtension}").exists() - } -} - -sourceSets { - main { - resources { - srcDir(layout.buildDirectory.dir("generated/resources")) - } - } -} - -tasks.processResources { - dependsOn(copyNativeLibrary) -} diff --git a/bindings/java/platform-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/VulkanNativeProvider.java b/bindings/java/platform-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/VulkanNativeProvider.java deleted file mode 100644 index fb3127f..0000000 --- a/bindings/java/platform-vulkan/src/main/java/cc/projectargus/libargus/platform/vulkan/VulkanNativeProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -package cc.projectargus.libargus.platform.vulkan; - -import cc.projectargus.libargus.spi.NativeLibraryProvider; -import java.io.InputStream; - -/** - * Native Library Provider for Vulkan execution. - */ -public final class VulkanNativeProvider implements NativeLibraryProvider { - @Override - public String getOs() { - return System.getProperty("os.name").toLowerCase(); - } - - @Override - public String getArch() { - return System.getProperty("os.arch").toLowerCase(); - } - - @Override - public String getBackend() { - return "vulkan"; - } - - @Override - public int getPriority() { - return 70; // Vulkan is medium priority, below ROCm but above CPU - } - - @Override - public InputStream getLibraryStream() { - String osName = getOs(); - String osArch = getArch(); - String osDir; - if (osName.contains("linux")) { - osDir = "linux-" + osArch; - } else if (osName.contains("windows")) { - osDir = "windows-" + osArch; - } else if (osName.contains("mac")) { - osDir = "macos-" + osArch; - } else { - osDir = "unknown"; - } - String libName = getLibraryName(); - return getClass().getResourceAsStream("/natives/" + osDir + "/vulkan/" + libName); - } - - @Override - public String getLibraryName() { - String osName = getOs(); - if (osName.contains("windows")) { - return "argus.dll"; - } else if (osName.contains("mac")) { - return "libargus.dylib"; - } else { - return "libargus.so"; - } - } -} diff --git a/bindings/java/platform-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider b/bindings/java/platform-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider deleted file mode 100644 index d9d0b51..0000000 --- a/bindings/java/platform-vulkan/src/main/resources/META-INF/services/cc.projectargus.libargus.spi.NativeLibraryProvider +++ /dev/null @@ -1 +0,0 @@ -cc.projectargus.libargus.platform.vulkan.VulkanNativeProvider diff --git a/build.gradle.kts b/build.gradle.kts index 2e0dee6..6abc031 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { base + id("com.gradleup.nmcp.aggregation") version "1.6.1" } // Build-time controls for hardware acceleration (e.g. CUDA, Metal) @@ -57,3 +58,108 @@ tasks.register("cleanCMake") { tasks.clean { dependsOn("cleanCMake") } + +repositories { + mavenCentral() +} + +subprojects { + repositories { + mavenCentral() + } + + plugins.withType { + apply(plugin = "maven-publish") + apply(plugin = "signing") + apply(plugin = "com.gradleup.nmcp") + + configure { + withSourcesJar() + withJavadocJar() + } + + tasks.withType { + (options as? StandardJavadocDocletOptions)?.apply { + addStringOption("Xdoclint:none", "-quiet") + encoding = "UTF-8" + charSet = "UTF-8" + } + } + + configure { + publications { + create("mavenJava") { + from(components["java"]) + artifactId = if (project.name == "bindings-java-core") "libargus-core" else project.name + + pom { + name.set(artifactId) + description.set("Unmanaged, zero-allocation native AI execution runtime behind Panama FFM boundary.") + url.set("https://github.com/ProjectArgus-cc/libargus.cc") + + licenses { + license { + name.set("MIT License") + url.set("https://opensource.org/licenses/MIT") + } + } + developers { + developer { + id.set("projectargus") + name.set("ProjectArgus Team") + } + } + scm { + connection.set("scm:git:git://github.com/ProjectArgus-cc/libargus.cc.git") + developerConnection.set("scm:git:ssh://github.com:ProjectArgus-cc/libargus.cc.git") + url.set("https://github.com/ProjectArgus-cc/libargus.cc") + } + } + } + } + repositories { + // 1. GitHub Packages Maven Registry + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/ProjectArgus-cc/libargus.cc") + credentials { + username = System.getenv("GITHUB_ACTOR") ?: project.findProperty("gpr.user")?.toString() + password = System.getenv("GITHUB_TOKEN") ?: project.findProperty("gpr.key")?.toString() + } + } + } + } + + configure { + val signingKey = System.getenv("GPG_PRIVATE_KEY") ?: project.findProperty("signing.key")?.toString() + val signingPassphrase = System.getenv("GPG_PASSPHRASE") ?: project.findProperty("signing.password")?.toString() + if (!signingKey.isNullOrEmpty()) { + useInMemoryPgpKeys(signingKey, signingPassphrase) + sign(extensions.getByType().publications["mavenJava"]) + } + } + } +} + +nmcpAggregation { + centralPortal { + username.set( + providers.gradleProperty("mavenCentralUsername") + .orElse(providers.environmentVariable("MAVEN_CENTRAL_USERNAME")) + ) + password.set( + providers.gradleProperty("mavenCentralPassword") + .orElse(providers.environmentVariable("MAVEN_CENTRAL_PASSWORD")) + ) + publishingType.set("AUTOMATIC") + } +} + +dependencies { + subprojects.forEach { subproject -> + "nmcpAggregation"(subproject) + } +} + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..61285a6 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..19a6bde --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/include/libargus.h b/include/libargus.h index 1d5a493..148f6ff 100644 --- a/include/libargus.h +++ b/include/libargus.h @@ -1,7 +1,7 @@ /** * @file libargus.h * @brief Unified Local Inference Core for Text, Audio Transcription, and Speech Synthesis. - * @version 1.4.1 + * @version 1.4.2 * * libargus provides an optimized, model-agnostic unmanaged orchestration layer over * GGML compute primitives. This file defines a strict, flat C Application Binary diff --git a/settings.gradle.kts b/settings.gradle.kts index c9f5d74..1d70b71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,15 +3,28 @@ rootProject.name = "libargus" include("bindings-java-core") project(":bindings-java-core").projectDir = file("bindings/java/core") -include("bindings-java-platform-cpu") -project(":bindings-java-platform-cpu").projectDir = file("bindings/java/platform-cpu") +include("libargus-native-linux-cpu") +project(":libargus-native-linux-cpu").projectDir = file("bindings/java/native-linux-cpu") -include("bindings-java-platform-cuda") -project(":bindings-java-platform-cuda").projectDir = file("bindings/java/platform-cuda") +include("libargus-native-windows-cpu") +project(":libargus-native-windows-cpu").projectDir = file("bindings/java/native-windows-cpu") -include("bindings-java-platform-rocm") -project(":bindings-java-platform-rocm").projectDir = file("bindings/java/platform-rocm") +include("libargus-native-linux-cuda") +project(":libargus-native-linux-cuda").projectDir = file("bindings/java/native-linux-cuda") + +include("libargus-native-windows-cuda") +project(":libargus-native-windows-cuda").projectDir = file("bindings/java/native-windows-cuda") + +include("libargus-native-linux-rocm") +project(":libargus-native-linux-rocm").projectDir = file("bindings/java/native-linux-rocm") + +include("libargus-native-linux-vulkan") +project(":libargus-native-linux-vulkan").projectDir = file("bindings/java/native-linux-vulkan") + +include("libargus-native-windows-vulkan") +project(":libargus-native-windows-vulkan").projectDir = file("bindings/java/native-windows-vulkan") + +include("libargus-native-macos-metal") +project(":libargus-native-macos-metal").projectDir = file("bindings/java/native-macos-metal") -include("bindings-java-platform-vulkan") -project(":bindings-java-platform-vulkan").projectDir = file("bindings/java/platform-vulkan") diff --git a/tests/test_libargus.cc b/tests/test_libargus.cc index 9bf5535..b97511f 100644 --- a/tests/test_libargus.cc +++ b/tests/test_libargus.cc @@ -22,7 +22,7 @@ int main() { // Assert compiled version query matches expectations std::cout << "[Test] Library Version: " << argus_version() << std::endl; - assert(std::strcmp(argus_version(), "1.4.1") == 0); + assert(std::strcmp(argus_version(), "1.4.2") == 0); // 2. Query backend count and list their names int32_t backend_count = argus_backend_get_count(); diff --git a/version.txt b/version.txt index 347f583..9df886c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.4.1 +1.4.2