fix macOS building with AppleClang; and pre-commit autoupdate (#210)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](pre-commit/pre-commit-hooks@v5.0.0...v6.0.0)
- [github.com/astral-sh/ruff-pre-commit: v0.12.5 → v0.12.10](astral-sh/ruff-pre-commit@v0.12.5...v0.12.10)

* macos-runner: install libomp

* macos test

* test apple building

* test apple building

* test apple building

* test apple building

* test apple building

* test apple building

* test apple building

* test apple building

* test apple building

* remove unused variables in test

* fix clang error

* revert ruff version

* update CHANGELOG

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Richard Preen <rpreen@gmail.com>

Author: pre-commit-ci[bot]

.github/workflows/macOS_build.yml

@@ -34,10 +34,14 @@ jobs:
         with:
           submodules: true
 
+      - name: Install OpenMP
+        run: |
+          brew install libomp
+          OPENMP_PREFIX=$(brew --prefix)/opt/libomp
+          echo "OpenMP_ROOT=$OPENMP_PREFIX" >> $GITHUB_ENV
+          echo "LDFLAGS=$LDFLAGS -L$OPENMP_PREFIX/lib" >> $GITHUB_ENV
+
       - name: Configure
-        env:
-          CC: gcc-12
-          CXX: g++-12
         working-directory: build
         run: cmake ..
           -DCMAKE_BUILD_TYPE=Release

CHANGELOG.md

@@ -7,6 +7,7 @@ Changes:
 *   Fix Python `json_read` crashing when the new population is empty ([#205](https://github.com/xcsf-dev/xcsf/pull/205))
 *   Reduce `max_trials` in Python tests for speed ([#206](https://github.com/xcsf-dev/xcsf/pull/206))
 *   Update Python packaging: move `setup.cfg` metadata to `pyproject.toml` ([#207](https://github.com/xcsf-dev/xcsf/pull/207))
+*   Fix macOS building with AppleClang ([#210](https://github.com/xcsf-dev/xcsf/pull/210))
 
 ## Version 1.4.7 (Aug 19, 2024)
 

CMakeLists.txt

@@ -53,7 +53,6 @@ if(NOT MSVC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-declarations")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wnested-externs")
@@ -76,9 +75,11 @@ if(NOT MSVC)
   if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wuninitialized")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlong-long")
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmaybe-uninitialized")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmaybe-uninitialized")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op")
   endif()
 else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")

test/cl_test.cpp

@@ -17,7 +17,7 @@
  * @file cl_test.cpp
  * @author Richard Preen <rpreen@gmail.com>
  * @copyright The Authors.
- * @date 2023--2024.
+ * @date 2023--2025.
  * @brief Classifier tests.
  */
 
@@ -36,11 +36,6 @@ extern "C" {
 #include <string.h>
 }
 
-const double x[5] = { 0.8455260670, 0.7566081103, 0.3125093674, 0.3449376898,
-                      0.3677518467 };
-
-const double y[1] = { 0.9 };
-
 TEST_CASE("CL")
 {
     /* Test initialisation */

xcsf/pybind_wrapper.cpp

@@ -841,7 +841,7 @@ class XCS
         // map None types
         if (params.contains("random_state")) {
             py::object rs = params["random_state"];
-            if (py::isinstance<py::int_>(rs) && py::int_(rs) < 0) {
+            if (py::isinstance<py::int_>(rs) && rs.cast<long long>() < 0) {
                 params["random_state"] = py::none();
             }
         }