diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index 44756ba..745cd41 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -26,10 +26,6 @@ jobs: cuda: "13.0.2" gcc: 13 config: Debug - - os: ubuntu-24.04 - cuda: "12.6.0" - gcc: 13 - config: Release - os: ubuntu-24.04 cuda: "12.6.0" gcc: 13 @@ -56,12 +52,6 @@ jobs: method: 'network' log-file-suffix: '${{matrix.os}}-gcc${{matrix.gcc}}-config${{matrix.config}}.txt' -# - name: Install CUDA -# env: -# cuda: ${{ matrix.cuda }} -# run: ./.github/action-scripts/install_cuda_ubuntu.sh -# shell: bash - # Specify the correct host compilers - name: Install/Select gcc and g++ run: | diff --git a/samples/s06_anyTriangleWithinRadius/anyTriangleWithinRadius.cu b/samples/s06_anyTriangleWithinRadius/anyTriangleWithinRadius.cu index fac686a..2d70055 100644 --- a/samples/s06_anyTriangleWithinRadius/anyTriangleWithinRadius.cu +++ b/samples/s06_anyTriangleWithinRadius/anyTriangleWithinRadius.cu @@ -19,10 +19,7 @@ void d_computeVolume(float *d_result, vec3i *d_indices, vec3f *d_vertices, box3f worldBounds, - bvh3f bvh, - /*! if true, we only check the bounding boxes of - triangles, not actual box-triangle tests */ - bool checkOnlyBoundingBoxes) + bvh3f bvh) { int ix = threadIdx.x+blockIdx.x*blockDim.x; if (ix >= dims.x) return; int iy = threadIdx.y+blockIdx.y*blockDim.y; if (iy >= dims.y) return; @@ -93,8 +90,7 @@ cuBQL::bvh3f buildBVH(int numTriangles, std::vector computeVolume(const std::vector &indices, const std::vector &vertices, vec3i dims, - box3f worldBounds, - bool checkOnlyBoundingBoxes) + box3f worldBounds) { int numCells = dims.x*dims.y*dims.z; std::vector result(numCells); @@ -110,7 +106,7 @@ std::vector computeVolume(const std::vector &indices, vec3i nb = divRoundUp(dims,bs); d_computeVolume<<<(dim3)nb,(dim3)bs>>>(d_result,dims,d_indices,d_vertices, worldBounds, - bvh,checkOnlyBoundingBoxes); + bvh); cuBQL::cuda::free(bvh); @@ -132,7 +128,6 @@ int main(int ac, char **av) { std::string inFileName = ""; std::string outFilePrefix = ""; - bool checkOnlyBoundingBoxes = false; int n = 256; for (int i=1;i result - = computeVolume(indices,vertices,dims,bb,checkOnlyBoundingBoxes); + = computeVolume(indices,vertices,dims,bb); const std::string outFileName = outFilePrefix +"_"+std::to_string(dims.x)