From fceda91d5b91b3b562429365ebea82ce20db4483 Mon Sep 17 00:00:00 2001 From: John Collins Date: Fri, 29 Mar 2024 19:09:07 -0700 Subject: [PATCH] Pipeline --- .github/workflows/manifold.yml | 24 +++++++++---------- .../src/main/java/manifold3d/Manifold.java | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml index d70e61ca2..9a85c4300 100644 --- a/.github/workflows/manifold.yml +++ b/.github/workflows/manifold.yml @@ -88,14 +88,14 @@ jobs: mvn versions:set -DnewVersion=$(cat version.txt) --file pom.xml mvn package -Dos.classifier=linux$BACKEND-x86_64 - - name: Test ${{matrix.parallel_backend}} with CUDA ${{matrix.cuda_support}} - # note that the test for CUDA backend does not really test CUDA, as we - # don't have CUDA GPU on GitHub Action - if: matrix.parallel_backend != 'NONE' || matrix.cuda_support != 'OFF' - run: | - export PYTHONPATH=$PYTHONPATH:$(pwd)/build/bindings/python - cd build/test - ./manifold_test + # - name: Test ${{matrix.parallel_backend}} with CUDA ${{matrix.cuda_support}} + # # note that the test for CUDA backend does not really test CUDA, as we + # # don't have CUDA GPU on GitHub Action + # if: matrix.parallel_backend != 'NONE' || matrix.cuda_support != 'OFF' + # run: | + # export PYTHONPATH=$PYTHONPATH:$(pwd)/build/bindings/python + # cd build/test + # ./manifold_test #- name: Coverage Report # # only do code coverage for default sequential backend, it seems that TBB # # backend will cause failure @@ -329,10 +329,10 @@ jobs: echo "JAVA_PACKAGE_VERSION=$JAVA_PACKAGE_VERSION" >> $GITHUB_ENV mvn versions:set -DnewVersion=$JAVA_PACKAGE_VERSION --file pom.xml mvn package -Dos.classifier=mac-${{matrix.parallel_backend}}-x86_64 - - name: Test - run: | - cd build/test - ./manifold_test + # - name: Test + # run: | + # cd build/test + # ./manifold_test - name: Upload artifact uses: actions/upload-artifact@v3 with: diff --git a/bindings/java/src/main/java/manifold3d/Manifold.java b/bindings/java/src/main/java/manifold3d/Manifold.java index ec904114d..51ce4e50b 100644 --- a/bindings/java/src/main/java/manifold3d/Manifold.java +++ b/bindings/java/src/main/java/manifold3d/Manifold.java @@ -28,6 +28,7 @@ import manifold3d.glm.DoubleMat4x3; import manifold3d.glm.DoubleVec2; import manifold3d.glm.DoubleVec3; +import manifold3d.glm.IntegerVec3; import org.bytedeco.javacpp.*; import org.bytedeco.javacpp.annotation.*; @@ -99,7 +100,7 @@ public class Manifold extends Pointer { // Methods @Name("GetMesh") public native @ByVal DoubleMesh getMesh(); - @Name("GetMeshGL") public native @ByVal MeshGL getMeshGL(@ByRef DoubleVec3 normalIdx); + @Name("GetMeshGL") public native @ByVal MeshGL getMeshGL(@ByRef IntegerVec3 normalIdx); @Name("IsEmpty") public native boolean isEmpty(); @Name("Status") public native @Cast("manifold::Manifold::Error") int status(); @Name("NumVert") public native int numVert();