Compiling on conda-forge's Macs (#59)

* First try
+ updatet to cmake 3.21
+ introduced presets
+ on linux both gcc and clang working
+ added markdown for overview

* Lose OpenMP as dependency
+ gcc and clang-linux working, same speed for test

* Loosen compile options

* Introduce virtual destructors to circumvent
main.cpp:32:9: warning: delete called on 'Matmodel<1>' that is abstract but has non-virtual destructor [-Wdelete-abstract-non-virtual-dtor]
   32 |         delete matmodel;
given through clang.
+ also applied the same to Solver

* Remove some of the hardcoded compiler paths for clang-macos

* Delete all hardcoded compiler paths

* Update CMake Setting
+ uncomment compile options
+ remove unnecessary comment
+ remove doubled CMake min version
+ introduce CXX_FLAGS for gcc in preset
    + also in parts for Clang, -fmax-errors does not exist  there
+ reintroduce RPATH-logic for Apple -> don't understand it
+ add condition to mac presets -> only loose, as darwin is open-source and could NOT be apple... but seems to be standard vs APPLE-check....

* removed presets not used in feedstock

---------

Co-authored-by: sanathkeshav <[email protected]>

Author: claudiushaag

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0...3.28)
+cmake_minimum_required(VERSION 3.21)
 
 # ##############################################################################
 # GENERAL SETTINGS
@@ -17,7 +17,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 # with -fno-implicit-templates I get linker errors when using std:: stuff
 # TODO: should be developer specific, by using e.g. CMake Presets
-set(CMAKE_CXX_FLAGS "-fmax-errors=1 -O3")
+set(CMAKE_CXX_FLAGS "-O3")
 set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
 
 # IPO
@@ -54,7 +54,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # From https://stackoverflow.com/questions/73248130/how-to-avoid-the-removal-of-the-rpath-during-cmake-install-step
-
 # Set RPATH to be relative and honor user overrides, whether at the command line or FetchContent
 if(APPLE)
         set(RPATH_BASE "@loader_path")
@@ -115,36 +114,8 @@ add_library(FANS::FANS ALIAS FANS_FANS)
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
 
 elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    # Detecting if there is avx2 and fma support on linux
-    # Deteced together, because these flags were introduced by Intel Haskell 4th. Gen
-    # Distinguishing between mac/linux because lscpu is used, which is not supported on mac.
-    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-        # macOS: Assume AVX2 and FMA are supported as per requirement
-        message(STATUS "Assuming AVX2 and FMA support on macOS; using -mavx2 and -mfma.")
-        target_compile_options(FANS_FANS PUBLIC -mavx2 -mfma)
-    elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # Linux: Check for AVX2 support using lscpu
-        execute_process(COMMAND lscpu OUTPUT_VARIABLE LSCPU_OUTPUT ERROR_QUIET)
-
-        # Default to AVX; enable AVX2 if supported by hardware
-        set(FANS_USE_AVX2 FALSE)
-        if (LSCPU_OUTPUT MATCHES "avx2")
-            set(FANS_USE_AVX2 TRUE)
-        endif()
-
-        # Apply compiler options based on hardware detection
-        if (FANS_USE_AVX2)
-            message(STATUS "AVX2 and FMA supported by hardware; using -mavx2 and -mfma.")
-            target_compile_options(FANS_FANS PUBLIC -mavx2 -mfma)
-        else()
-            message(WARNING "AVX2 and FMA not supported by hardware; falling back to AVX.")
-            target_compile_options(FANS_FANS PUBLIC -mavx)
-        endif()
-    else()
-        message(WARNING "Unsupported system for AVX2 detection; defaulting to -mavx.")
-        target_compile_options(FANS_FANS PUBLIC -mavx)
-    endif()
-endif()
+    target_compile_options(FANS_FANS PUBLIC -mavx2 -mfma)
+endif ()
 
 add_executable(FANS_main)
 add_custom_command(

CMakePresets.json

@@ -0,0 +1,43 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "gcc-release",
+      "displayName": "GCC Release (Linux)",
+      "description": "GCC compiler with Release build type",
+      "generator": "Unix Makefiles",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_CXX_FLAGS": "-fmax-errors=1 -O3",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      }
+    },
+    {
+      "name": "clang-release-macos",
+      "displayName": "Clang Release (macOS)",
+      "description": "macOS system Clang for Release",
+      "generator": "Unix Makefiles",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "gcc-release",
+      "configurePreset": "gcc-release"
+    },
+    {
+      "name": "clang-release-macos",
+      "configurePreset": "clang-release-macos"
+    }
+  ]
+}

include/matmodel.h

@@ -43,6 +43,8 @@ class Matmodel {
 
     vector<double> macroscale_loading;
 
+    virtual ~Matmodel() = default;
+
   protected:
     double l_e_x;
     double l_e_y;

include/solver.h

@@ -9,6 +9,7 @@ template <int howmany>
 class Solver {
   public:
     Solver(Reader reader, Matmodel<howmany> *matmodel);
+    virtual ~Solver() = default;
 
     Reader reader;