Merge pull request #2 from ipc-sim/main

update ipc

Author: maxpaik16

.clang-format

@@ -8,7 +8,32 @@ BinPackParameters: false
 AllowAllParametersOfDeclarationOnNextLine: true
 AlignAfterOpenBracket: AlwaysBreak
 BreakBeforeBinaryOperators: NonAssignment
-SortIncludes: false
+SortIncludes: true
 CommentPragmas:  '^@.+'
 BreakStringLiterals: false
 PackConstructorInitializers: CurrentLine
+# Regroup includes with a priority system
+IncludeBlocks: Regroup
+IncludeCategories:
+  # by default, the main header of a cpp will get priority 0
+  # regex here are sorted by search pattern, not by sort priority
+  - Regex:           "^<ipc\/[^/]*>" # this libraries
+    Priority:        2    # internal library group
+    SortPriority:    2
+    CaseSensitive:   true
+  - Regex:           "^<ipc\/.*\/.*>" # this libraries
+    Priority:        2    # internal library group
+    SortPriority:    3
+    CaseSensitive:   true
+  - Regex:           "^<(.*\\.h[px]*)|(Eigen\/.*)>"
+    Priority:        4    # libraries (because they end in .h)
+    SortPriority:    4
+    CaseSensitive:   false
+  - Regex:           "^<.*"
+    Priority:        5    # system (without .h, because that is captured by the other group)
+    SortPriority:    5
+    CaseSensitive:   false
+  - Regex:           ".*" # catch-all for internal files
+    Priority:        1    # internal file group
+    SortPriority:    1
+    CaseSensitive:   true

.gitattributes

@@ -1,2 +1,3 @@
 # These files should be ignored from GitHub's language statistics.
 python/example.ipynb linguist-vendored
+notebooks/*.ipynb linguist-vendored

.github/pull_request_template.md

@@ -22,10 +22,10 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] Test B
 
 **Test Configuration**:
-* OS and version:
-* Compile and version:
+* OS and Version:
+* Compiler and Version:
 
-# Checklist:
+# Checklist
 
 - [ ] I have followed the project [style guide](https://ipctk.xyz/style_guide.html)
 - [ ] My code follows the clang-format style guidelines of this project
@@ -35,5 +35,4 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] My changes generate no new warnings
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes
-- [ ] Any dependent changes have been merged and published in downstream modules
-
+- [ ] Any dependent changes have been merged and published in downstream modules

.github/workflows/pypi.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [cp38, cp39, cp310, cp311, cp312]
+        python-version: [cp39, cp310, cp311, cp312, cp313]
         arch: [x86_64, arm64]
         exclude:
           - os: ubuntu-latest
@@ -40,14 +40,14 @@ jobs:
       - uses: actions/[email protected]
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.21.3
         # to supply options, put them in 'env', like:
         env:
           MACOSX_DEPLOYMENT_TARGET: "11.0"
           CIBW_ARCHS: auto64
           CIBW_ARCHS_MACOS: ${{ matrix.arch }}
           CIBW_BUILD: ${{ matrix.python-version }}-*
-          CIBW_SKIP: "cp36-* cp37-* pp* *musllinux* *manylinux1* *-win32 *linux_i686 *linux_aarch64 *linux_ppc64le *linux_s390x"
+          CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *musllinux* *manylinux1* *-win32 *linux_i686 *linux_aarch64 *linux_ppc64le *linux_s390x"
 
       - uses: actions/upload-artifact@v3
         with:
@@ -75,7 +75,7 @@ jobs:
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           # unpacks default artifact into dist/
           # if `name: artifact` is omitted, the action will create extra parent dir

.github/workflows/python.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os: ubuntu-latest
             name: Linux

.gitignore

@@ -487,6 +487,7 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+CMakeUserPresets.json
 
 
 ## Build

CMakeLists.txt

@@ -59,11 +59,18 @@ endif()
 project(IPCToolkit
         DESCRIPTION "A set of reusable functions to integrate IPC into an existing simulation."
         LANGUAGES CXX
-        VERSION "1.3.1")
+        VERSION "1.4.0")
 
-option(IPC_TOOLKIT_BUILD_TESTS                "Build unit-tests"  ${IPC_TOOLKIT_TOPLEVEL_PROJECT})
-option(IPC_TOOLKIT_BUILD_PYTHON               "Build Python bindings"                         OFF)
-option(IPC_TOOLKIT_WITH_CUDA                  "Enable CUDA CCD"                               OFF)
+include(CheckLanguage)
+check_language(CUDA)
+
+option(IPC_TOOLKIT_BUILD_TESTS  "Build unit-tests" ${IPC_TOOLKIT_TOPLEVEL_PROJECT})
+option(IPC_TOOLKIT_BUILD_PYTHON "Build Python bindings"                        OFF)
+if(CMAKE_CUDA_COMPILER)
+  option(IPC_TOOLKIT_WITH_CUDA "Enable CUDA CCD" ON)
+else()
+  option(IPC_TOOLKIT_WITH_CUDA "Enable CUDA CCD" OFF)
+endif()
 option(IPC_TOOLKIT_WITH_RATIONAL_INTERSECTION "Use rational edge-triangle intersection check" OFF)
 option(IPC_TOOLKIT_WITH_ROBIN_MAP             "Use Tessil's robin-map rather than std maps"    ON)
 option(IPC_TOOLKIT_WITH_ABSEIL                "Use Abseil's hash functions"                    ON)
@@ -118,13 +125,6 @@ add_subdirectory("${IPC_TOOLKIT_SOURCE_DIR}")
 # Public include directory for IPC Toolkit
 target_include_directories(ipc_toolkit PUBLIC "${IPC_TOOLKIT_INCLUDE_DIR}")
 
-################################################################################
-# Optional Definitions
-################################################################################
-
-# For MSVC, do not use the min and max macros.
-target_compile_definitions(ipc_toolkit PUBLIC NOMINMAX)
-
 ################################################################################
 # Dependencies
 ################################################################################
@@ -208,6 +208,11 @@ else()
   message(STATUS "SIMD support disabled")
 endif()
 
+# For MSVC, do not use the min and max macros.
+if(MSVC)
+  target_compile_definitions(ipc_toolkit PRIVATE NOMINMAX)
+endif()
+
 # Use C++17
 target_compile_features(ipc_toolkit PUBLIC cxx_std_17)
 
@@ -216,15 +221,13 @@ target_compile_features(ipc_toolkit PUBLIC cxx_std_17)
 ################################################################################
 
 if(IPC_TOOLKIT_WITH_CUDA)
-  include(CheckLanguage)
-  check_language(CUDA)
-
-  if(CMAKE_CUDA_COMPILER)
-    enable_language(CUDA)
-  else()
-    message(FATAL_ERROR "No CUDA support found!")
+  if(NOT CMAKE_CUDA_COMPILER)
+    message(FATAL_ERROR "CUDA support requested but no CUDA compiler found!")
   endif()
 
+  # Enable CUDA support
+  enable_language(CUDA)
+
   # We need to explicitly state that we need all CUDA files in the particle
   # library to be built with -dc as the member functions could be called by
   # other libraries and executables.