Some minor revisions.

Author: tatsy

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18...3.27)
+cmake_minimum_required(VERSION 3.18)
 project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES CXX)
 
 # General settings
@@ -21,37 +21,28 @@ if(CMAKE_CUDA_COMPILER)
   message(STATUS "CMAKE_CUDA_COMPILER = ${CMAKE_CUDA_COMPILER}")
   message(STATUS "CMAKE_CUDA_COMPILER_ID = ${CMAKE_CUDA_COMPILER_ID}")
   message(STATUS "CMAKE_CUDA_COMPILER_VERSION = ${CUDA_V}")
-
 else()
-  message(STATUS "NO CUDA INSTALLATION FOUND, INSTALLING CPU VERSION ONLY!")
-  # execute_process(COMMAND ${Python_EXECUTABLE} -m pip uninstall -y torch)
-  # execute_process(COMMAND ${Python_EXECUTABLE} -m pip install -v torch --extra-index-url https://download.pytorch.org/whl/cpu)
+  message(WARNING "NO CUDA INSTALLATION FOUND, TRYING TO INSTALL CPU VERSION ONLY!")
 endif()
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(MSVC)
-  add_definitions(-DNOMINMAX)
+  add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/utf-8>")
+  add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=/utf-8>")
+  add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 # Find packages
-find_package(Python REQUIRED COMPONENTS Interpreter Development)
+find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 find_package(pybind11 CONFIG REQUIRED)
-
-# OpenMP
 find_package(OpenMP)
-if (OPENMP_FOUND)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
 
-# PyTorch settings
-find_package(Torch REQUIRED)
+find_package(Torch CONFIG REQUIRED)
 find_library(TORCH_PYTHON_LIBRARY torch_python PATH "${TORCH_INSTALL_PREFIX}/lib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
 
 add_subdirectory(cxx)
-
 install(TARGETS ${BUILD_TARGET} LIBRARY DESTINATION .)

README.md

@@ -1,5 +1,4 @@
-torchmcubes: marching cubes for PyTorch
-===
+# torchmcubes: marching cubes for PyTorch
 
 [![Build (CPU)](https://github.com/tatsy/torchmcubes/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/tatsy/torchmcubes/actions/workflows/build.yml)
 
@@ -12,9 +11,9 @@ torchmcubes: marching cubes for PyTorch
 - Python (3.9 or later)
 - NumPy (1.x is preferable)
 - PyTorch
-- cmake (3.18 or later)
+- CMake (3.18 or later)
 
-Make sure that you have nvcc CUDA compiler
+Make sure that you have nvcc CUDA compiler with the following command.
 
 ```shell
 nvcc --version
@@ -27,7 +26,6 @@ export CUDA_HOME=/usr/local/cuda/
 export PATH=$CUDA_HOME/bin:$PATH
 ```
 
-
 ### Pip installation
 
 ```shell

cxx/CMakeLists.txt

@@ -1,5 +1,4 @@
-include_directories(${TORCH_INCLUDE_DIRS})
-
+include_directories (${TORCH_INCLUDE_DIRS})
 Python_add_library(${BUILD_TARGET}
   mcubes.cpp
   mcubes_cpu.cpp
@@ -17,7 +16,8 @@ endif()
 target_link_libraries(${BUILD_TARGET} PRIVATE
   pybind11::headers
   ${TORCH_LIBRARIES}
-  ${TORCH_PYTHON_LIBRARY})
+  ${TORCH_PYTHON_LIBRARY}
+)
 
 if (OPENMP_FOUND)
   target_link_libraries(${BUILD_TARGET} PRIVATE OpenMP::OpenMP_CXX)

pyproject.toml

@@ -19,19 +19,24 @@ dependencies=["numpy", "torch"]
 
 [tool.scikit-build]
 build-dir = "build"
-wheel.license-files = []
-minimum-version = "0.2"
-logging.level = "INFO"
+minimum-version = "0.10"
 ninja.make-fallback = true
+logging.level = "INFO"
+build.verbose = true
+messages.after-success = "SUCCESS!!"
+messages.after-failure = "FAILURE!!"
 
 [tool.scikit-build.cmake]
-minimum-version = "3.18"
-verbose = true
+version = ">=3.15"
 source-dir = "."
 args = []
 
+[tool.scikit-build.wheel]
+license-files = ["LICENSE"]
+exclude = ["**/.mypy_cache/**", "**/build/**", "**/.vscode/**"]
+
 [build-system]
-requires = ["scikit-build-core>=0.2", "pybind11>=2.10"]
+requires = ["scikit-build-core>=0.10", "pybind11>=2.10", "cmake", "ninja"]
 build-backend = "scikit_build_core.build"
 
 [tool.isort]