Merge pull request #56 from Forceflow/dev

Forceflow · web-flow · commit 0ddec635aba8 · 2021-07-31T18:27:36.000+02:00
Merge dev
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -0,0 +1,122 @@
+name: build
+
+on: 
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    branches:
+      - main
+      - dev
+jobs:
+  linux-build:
+    runs-on: ubuntu-20.04
+    container: nvidia/cuda:11.3.0-devel-ubuntu20.04
+    
+    env: 
+      CUDAARCHS: '60'
+      TRIMESH_VERSION: '2020.03.04'
+      CMAKE_VERSION: '3.20.4'
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2 
+
+    - name: Install GLM, OpenMP and other libraries
+      run: | 
+        apt update
+        apt install -y --no-install-recommends apt-utils
+        apt install -y libglm-dev libgomp1 git mesa-common-dev libglu1-mesa-dev libxi-dev wget ninja-build
+    
+    - name: Install CMake
+      run: |
+        wget -q -O ./cmake-install.sh https://github.com/Kitware/CMake/releases/download/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION }}-Linux-x86_64.sh 
+        chmod u+x ./cmake-install.sh
+        mkdir "$HOME"/cmake
+        ./cmake-install.sh --skip-license --prefix="$HOME"/cmake
+        rm ./cmake-install.sh
+    
+    - name: Build Trimesh2
+      run: |
+        git clone --single-branch --depth 1 -b ${{ env.TRIMESH_VERSION }} https://github.com/Forceflow/trimesh2.git ../trimesh2
+        cd ../trimesh2
+        make all -j $(nproc)
+        make clean
+
+    - name: Configure cuda_voxelizer
+      run: |
+        PATH=$PATH:"$HOME"/cmake/bin
+        cmake -GNinja \
+        -DTrimesh2_INCLUDE_DIR="../trimesh2/include" \
+        -DTrimesh2_LINK_DIR="../trimesh2/lib.Linux64" \
+        -S . -B ./build
+
+    - name: Build cuda_voxelizer
+      run: |
+        PATH=$PATH:"$HOME"/cmake/bin
+        cmake --build ./build --parallel $(nproc)
+
+    - name: Test
+      run: ./build/cuda_voxelizer -f ./test_models/bunny.OBJ -s 64 -cpu
+  
+  windows-build:
+    runs-on: windows-2019
+    env:
+      CUDA_MAJOR_VERSION: '11.4'
+      CUDA_PATCH_VERSION: '0'
+      TRIMESH_VERSION: '2020.03.04'
+      CUDAARCHS: '60'
+    
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cache Trimesh2
+      id: trimesh2-cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ runner.workspace }}\trimesh2-build
+        key: ${{ runner.os }}-build-trimesh2-cache-1
+
+    
+    # Older version then 11.4.0 of CUDA Toolkit does not have thrust option for installation in silent mode 
+    - uses: Jimver/cuda-toolkit@v0.2.4
+      id: cuda-toolkit
+      with:
+        method: 'network'
+        cuda: '${{ env.CUDA_MAJOR_VERSION }}.${{ env.CUDA_PATCH_VERSION }}'
+        sub-packages: '["nvcc", "cudart", "visual_studio_integration", "thrust"]'
+
+    - name: Install GLM
+      run: |
+        vcpkg.exe install glm:x64-windows
+
+    - name: Build Trimesh2
+      if: steps.trimesh2-cache.outputs.cache-hit != 'true'
+      run: |
+        Install-Module VSSetup -Scope CurrentUser -Force
+        git clone -b ${{ env.TRIMESH_VERSION }} --single-branch --depth 1 https://github.com/Forceflow/trimesh2.git ..\trimesh2
+        cd ..\trimesh2
+        & (Join-Path (Get-VSSetupInstance).InstallationPath -ChildPath MSBuild\Current\Bin\msbuild.exe) .\msvc\vs2019\trimesh2.sln -nologo -m:2 /t:libsrc /p:Configuration=Release /p:Platform=x64
+        mkdir ..\trimesh2-build
+        Move-Item .\include ..\trimesh2-build
+        Move-Item .\lib.Win64.vs142 ..\trimesh2-build
+        cd -
+        rm -Recurse -Force ..\trimesh2
+
+    - name: Configure cuda_voxelizer
+      run: |
+        $trimeshDir = "..\trimesh2-build"
+        cmake -A x64 `
+        -DCMAKE_TOOLCHAIN_FILE:FILEPATH="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" `
+        -DTrimesh2_INCLUDE_DIR:PATH="$trimeshDir\include" `
+        -DTrimesh2_LINK_DIR:PATH="$trimeshDir\lib.Win64.vs142" `
+        -DCMAKE_BUILD_TYPE=Release `
+        -S . -B .\build
+    
+    - name: Build cuda_voxelizer
+      run: cmake --build .\build --parallel 2 --target ALL_BUILD --config Release
+    
+    - name: Test cuda_voxelizer
+      run: .\build\Release\cuda_voxelizer.exe -f .\test_models\bunny.OBJ -s 64 -cpu
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,32 +1,21 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.13 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.20 FATAL_ERROR)
 
-PROJECT(CudaVoxelize LANGUAGES CXX)
+PROJECT(CudaVoxelize LANGUAGES CXX CUDA)
 
-IF(MSVC)
-ENABLE_LANGUAGE(CUDA)
-ENDIF()
-
-FIND_PACKAGE(glm REQUIRED)
+FIND_PACKAGE(glm CONFIG REQUIRED)
 FIND_PACKAGE(OpenMP REQUIRED)
-
-IF(NOT MSVC)
-FIND_PACKAGE(CUDA REQUIRED)
-ENDIF()
+FIND_PACKAGE(CUDAToolkit REQUIRED)
 
 SET(CUDA_VOXELIZER_EXECUTABLE cuda_voxelizer)
 
 SET(Trimesh2_INCLUDE_DIR CACHE PATH "Path to Trimesh2 includes")
-SET(CUDA_ARCH CACHE STRING "CUDA compute capability. It is prefer to set native value for your video card. Example: 61")
-
-IF(NOT CUDA_ARCH)
-	MESSAGE(FATAL_ERROR "You must set CUDA_ARCH variable. For example: 61.")
-ENDIF()
 
 IF(NOT Trimesh2_INCLUDE_DIR)
   MESSAGE(FATAL_ERROR "You need to set variable Trimesh2_INCLUDE_DIR")
 ENDIF()
 
 FIND_FILE(Trimesh2_TriMesh_h TriMesh.h ${Trimesh2_INCLUDE_DIR})
+
 IF(NOT Trimesh2_TriMesh_h)
 	message(FATAL_ERROR "Can't find TriMesh.h in ${Trimesh2_INCLUDE_DIR}")
 ENDIF()
@@ -49,7 +38,6 @@ IF(NOT Trimesh2_LIBRARY)
 ENDIF()
 MARK_AS_ADVANCED(Trimesh2_LIBRARY)
 
-MESSAGE(STATUS "CUDA compute capability set to ${CUDA_ARCH}")
 MESSAGE(STATUS "Found Trimesh2 include: ${Trimesh2_TriMesh_h}")
 MESSAGE(STATUS "Found Trimesh2 lib: ${Trimesh2_LIBRARY}")
 
@@ -65,19 +53,11 @@ SET(CUDA_VOXELIZER_SRCS_CU
   ./src/voxelize_solid.cu
 )
 
-IF(MSVC)
 ADD_EXECUTABLE(
   ${CUDA_VOXELIZER_EXECUTABLE}
   ${CUDA_VOXELIZER_SRCS}
   ${CUDA_VOXELIZER_SRCS_CU})
-ELSE()
-CUDA_ADD_EXECUTABLE(
-  ${CUDA_VOXELIZER_EXECUTABLE}
-  ${CUDA_VOXELIZER_SRCS}
-  ${CUDA_VOXELIZER_SRCS_CU})
-ENDIF()
 
-TARGET_COMPILE_FEATURES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE cxx_std_11)
+TARGET_COMPILE_FEATURES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE cxx_std_17)
 TARGET_INCLUDE_DIRECTORIES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES (${CUDA_VOXELIZER_EXECUTABLE} ${Trimesh2_LIBRARY} glm OpenMP::OpenMP_CXX)
-TARGET_COMPILE_OPTIONS(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:-gencode arch=compute_${CUDA_ARCH},code=sm_${CUDA_ARCH}>)
+TARGET_LINK_LIBRARIES(${CUDA_VOXELIZER_EXECUTABLE} PRIVATE ${Trimesh2_LIBRARY} PRIVATE OpenMP::OpenMP_CXX PRIVATE CUDA::cudart PRIVATE glm::glm)
diff --git a/README.md b/README.md
@@ -45,19 +45,20 @@ The project has the following build dependencies:
 After installing dependencies, do `mkdir build` and `cd build`, followed by:
 
 For Windows with Visual Studio 2019:
-```
-cmake -A x64 -DTrimesh2_INCLUDE_DIR:PATH="path_to_trimesh2_include" -DTrimesh2_LINK_DIR:PATH="path_to_trimesh2_library_dir" -DCUDA_ARCH:STRING="your_cuda_compute_capability" .. 
+```powershell
+$env:CUDAARCHS="your_cuda_compute_capability"
+cmake -A x64 -DTrimesh2_INCLUDE_DIR:PATH="path_to_trimesh2_include" -DTrimesh2_LINK_DIR:PATH="path_to_trimesh2_library_dir" .. 
 ```
 
 For Linux:
+```bash
+CUDAARCHS="your_cuda_compute_capability" cmake -DTrimesh2_INCLUDE_DIR:PATH="path_to_trimesh2_include" -DTrimesh2_LINK_DIR:PATH="path_to_trimesh2_library_dir" -DCUDA_ARCH:STRING="your_cuda_compute_capability" .. 
 ```
-cmake -DTrimesh2_INCLUDE_DIR:PATH="path_to_trimesh2_include" -DTrimesh2_LINK_DIR:PATH="path_to_trimesh2_library_dir" -DCUDA_ARCH:STRING="your_cuda_compute_capability" .. 
-```
-Where `your_cuda_compute_capability` is a string specifying your CUDA architecture ([more info here](https://docs.nvidia.com/cuda/archive/10.2/cuda-compiler-driver-nvcc/index.html#options-for-steering-gpu-code-generation-gpu-architecture)). For example: `-DCUDA_ARCH:STRING=61` or `-DCUDA_ARCH:STRING=60`.
+Where `your_cuda_compute_capability` is a string specifying your CUDA architecture ([more info here](https://docs.nvidia.com/cuda/archive/10.2/cuda-compiler-driver-nvcc/index.html#options-for-steering-gpu-code-generation-gpu-architecture) and [here CMake](https://cmake.org/cmake/help/v3.20/envvar/CUDAARCHS.html#envvar:CUDAARCHS)). For example: `CUDAARCHS="50;61"` or `CUDAARCHS="60"`.
 
 Finally, run
 ```
-cmake --build . -j number_of_cores
+cmake --build . --parallel number_of_cores
 ```
 
 ### Build using Visual Studio project (Windows)
diff --git a/msvc/vs2019/cuda_voxelizer.vcxproj b/msvc/vs2019/cuda_voxelizer.vcxproj
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.2.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.3.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -133,6 +133,6 @@ copy /y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName).exe" "$(BINARY
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.2.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.3.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/main.cpp b/src/main.cpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <cstdio>
 // GLM for maths
-#define GLM_FORCE_PURE
+// #define GLM_FORCE_PURE GLM_FORCE_PURE (not needed anymore with recent GLM versions)
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 // Trimesh for model importing
@@ -20,7 +20,7 @@
 #include "cpu_voxelizer.h"
 
 using namespace std;
-string version_number = "v0.4.10";
+string version_number = "v0.4.11";
 
 // Forward declaration of CUDA functions
 float* meshToGPU_thrust(const trimesh::TriMesh *mesh); // METHOD 3 to transfer triangles can be found in thrust_operations.cu(h)
diff --git a/src/thrust_operations.cuh b/src/thrust_operations.cuh
@@ -3,13 +3,13 @@
 // Trimesh for model importing
 #include "TriMesh.h"
 // CUDA
-#include "cuda.h"
-#include "cuda_runtime.h"
+#include <cuda.h>
+#include <cuda_runtime.h>
 // Thrust
-#include "thrust/device_vector.h"
-#include "thrust/host_vector.h"
+#include <thrust/device_vector.h>
+#include <thrust/host_vector.h>
 #define GLM_FORCE_CUDA
-#define GLM_FORCE_PURE
+// #define GLM_FORCE_PURE
 // GLM for maths
 #include <glm/glm.hpp>
 #include "util.h"
diff --git a/src/util_io.cpp b/src/util_io.cpp
@@ -29,17 +29,17 @@ void read_binary(void* data, const size_t length, const std::string base_filenam
 }
 
 // Helper function to write single vertex normal to OBJ file
-void write_vertex_normal(ofstream& output, const glm::ivec3& v) {
+static void write_vertex_normal(ofstream& output, const glm::ivec3& v) {
 	output << "vn " << v.x << " " << v.y << " " << v.z << endl;
 }
 
 // Helper function to write single vertex to OBJ file
-void write_vertex(ofstream& output, const glm::ivec3& v) {
+static void write_vertex(ofstream& output, const glm::ivec3& v) {
 	output << "v " << v.x << " " << v.y << " " << v.z << endl;
 }
 
 // Helper function to write single vertex
-void write_face(ofstream& output, const glm::ivec3& v) {
+static void write_face(ofstream& output, const glm::ivec3& v) {
 	output << "f " << v.x << " " << v.y << " " << v.z << endl;
 }
 
@@ -106,18 +106,29 @@ void write_obj_cubes(const unsigned int* vtable, const voxinfo v_info, const std
 	//write_vertex_normal(output, glm::ivec3(0, -1, 0)); // bottom = 5
 	//write_vertex_normal(output, glm::ivec3(0, 1, 0)); // top = 6
 
+	// Write stats
+	size_t voxels_seen = 0;
+	const size_t write_stats_25 = (size_t(v_info.gridsize.x) * size_t(v_info.gridsize.y) * size_t(v_info.gridsize.z)) / 4.0f;
+	fprintf(stdout, "[I/O] Writing to file: 0%%...");
+
 	//size_t voxels_written = 0;
 	assert(output);
 	for (size_t x = 0; x < v_info.gridsize.x; x++) {
 		for (size_t y = 0; y < v_info.gridsize.y; y++) {
 			for (size_t z = 0; z < v_info.gridsize.z; z++) {
+				voxels_seen++;
+				if (voxels_seen == write_stats_25) {fprintf(stdout, "25%%...");}
+				else if (voxels_seen == write_stats_25 * size_t(2)) {fprintf(stdout, "50%%...");}
+				else if (voxels_seen == write_stats_25 * size_t(3)) {fprintf(stdout, "75%%...");
+				}
 				if (checkVoxel(x, y, z, v_info.gridsize, vtable)) {
 					//voxels_written += 1;
-					write_cube(x, y, z, output);
+					write_cube(x, y, z, output);	
 				}
 			}
 		}
 	}
+	fprintf(stdout, "100%% \n");
 	// std::cout << "written " << voxels_written << std::endl;
 
 	fprintf(stdout, "[I/O] Reordering / Optimizing mesh with Trimesh2 \n");
@@ -141,21 +152,31 @@ void write_obj_pointcloud(const unsigned int* vtable, const voxinfo v_info, cons
 #endif
 	ofstream output(filename_output.c_str(), ios::out);
 	
+	// Write stats
+	size_t voxels_seen = 0;
+	const size_t write_stats_25 = (size_t(v_info.gridsize.x) * size_t(v_info.gridsize.y) * size_t(v_info.gridsize.z)) / 4.0f;
+	fprintf(stdout, "[I/O] Writing to file: 0%%...");
+
 	// write stats
 	size_t voxels_written = 0;
 
 	assert(output);
 	for (size_t x = 0; x < v_info.gridsize.x; x++) {
 		for (size_t y = 0; y < v_info.gridsize.y; y++) {
 			for (size_t z = 0; z < v_info.gridsize.z; z++) {
+				voxels_seen++;
+				if (voxels_seen == write_stats_25) { fprintf(stdout, "25%%...");}
+				else if (voxels_seen == write_stats_25 * size_t(2)) { fprintf(stdout, "50%%...");}
+				else if (voxels_seen == write_stats_25 * size_t(3)) {fprintf(stdout, "75%%...");}
 				if (checkVoxel(x, y, z, v_info.gridsize, vtable)) {
 					voxels_written += 1;
 					output << "v " << (x+0.5) << " " << (y + 0.5) << " " << (z + 0.5) << endl; // +0.5 to put vertex in the middle of the voxel
 				}
 			}
 		}
 	}
-	std::cout << "written " << voxels_written << std::endl;
+	fprintf(stdout, "100%% \n");
+	// std::cout << "written " << voxels_written << std::endl;
 	output.close();
 }
 
diff --git a/src/voxelize.cuh b/src/voxelize.cuh
@@ -2,12 +2,12 @@
 
 // Commun functions for both the solid and non-solid voxelization methods
 
-#include "cuda.h"
-#include "cuda_runtime.h"
-#include "device_launch_parameters.h"
+#include <cuda.h>
+#include <cuda_runtime.h>
+#include <device_launch_parameters.h>
 
 #define GLM_FORCE_CUDA
-#define GLM_FORCE_PURE
+// #define GLM_FORCE_PURE (not needed anymore with recent GLM versions)
 #include <glm/glm.hpp>
 
 #include <iostream>
