Fix conan on arm (#125)

* Add arm profiles

* Add check depending on arch

* Bump benchmark version

* Fix "aarch64" -> "arm64" on conan Setup.py

* Fix RPi support

---------

Co-authored-by: Philipp Basler <[email protected]>
Co-authored-by: João Viana <[email protected]>

.github/GetProfile.py

@@ -0,0 +1,16 @@
+import os
+import sys
+
+current = os.path.dirname(os.path.realpath(__file__))
+parent = os.path.dirname(current)
+sys.path.append(parent)
+
+import Build
+
+if __name__ == "__main__":
+
+    env_file = os.getenv('GITHUB_ENV')
+    with open(env_file, "a") as myfile:
+        myfile.write(f"GeneratedCMakeProfile={Build.get_preset()}")
+
+        print(f"Setting GeneratedCMakeProfile={Build.get_preset()}")

.github/workflows/codecov.yml

@@ -51,11 +51,15 @@ jobs:
     - name: Install conan
       run: pip install conan>2
     - run: python3 Setup.py --options EnableCoverage=True CompileBaryo=True UseVectorization=False
-    - run: cmake --preset conan-linux-x86_64-release
+
+    - name: Set cmake preset name
+      run: python3 .github/GetProfile.py
+
+    - run: cmake --preset $GeneratedCMakeProfile
     - name: compile
-      run: cmake --build --preset conan-linux-x86_64-release -j${{ steps.cpu-cores.outputs.count }}
+      run: cmake --build --preset $GeneratedCMakeProfile -j${{ steps.cpu-cores.outputs.count }}
     - name: Generate Coverage
-      run: cmake --build --preset conan-linux-x86_64-release -j${{ steps.cpu-cores.outputs.count }} -t coverage
+      run: cmake --build --preset $GeneratedCMakeProfile -j${{ steps.cpu-cores.outputs.count }} -t coverage
     - name: Upload coverage
       uses: codecov/codecov-action@v4
       with:

.github/workflows/codeql.yml

@@ -54,11 +54,16 @@ jobs:
       - name: Setup
         run: python3 Setup.py --options CompileBaryo=True
         if: matrix.language == 'cpp'
+
+      - name: Set cmake preset name
+        run: python3 .github/GetProfile.py
+        if: matrix.language == 'cpp'
+
       - name: Preset cmake
-        run: cmake --preset conan-linux-x86_64-release
+        run: cmake --preset $GeneratedCMakeProfile
         if: matrix.language == 'cpp'
       - name: build
-        run: cmake --build --preset conan-linux-x86_64-release -j${{ steps.cpu-cores.outputs.count }} 
+        run: cmake --build --preset $GeneratedCMakeProfile -j${{ steps.cpu-cores.outputs.count }} 
         if: matrix.language == 'cpp'
 
       - name: Autobuild

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
   tests-fullSetup:
     strategy:
       matrix:
-        setup: [ {os: ubuntu-latest, profile: conan-linux-x86_64-release}, {os: windows-latest, profile: conan-windows-x86_64-release}, {os: macos-latest, profile: conan-macos-x86_64-release}] 
+        setup: [ {os: ubuntu-latest}, {os: windows-latest}, {os: macos-latest}] 
     runs-on: ${{matrix.setup.os}}
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
 
@@ -39,12 +39,29 @@ jobs:
       uses: SimenB/github-actions-cpu-cores@v2
       id: cpu-cores
     - run: python3 Setup.py --options CompileBaryo=True
+
+    - name: Set cmake preset name
+      run: python3 .github/GetProfile.py
+
+    - name: cmake
+      run: cmake --preset $GeneratedCMakeProfile
+      if: runner.os != 'Windows'
+    - name: build
+      run: cmake --build --preset $GeneratedCMakeProfile -j${{ steps.cpu-cores.outputs.count }}
+      if: runner.os != 'Windows'
+    - name: run tests
+      run: ctest --preset $GeneratedCMakeProfile -j --output-on-failure 
+      if: runner.os != 'Windows'
+
     - name: cmake
-      run: cmake --preset ${{matrix.setup.profile}}
+      run: cmake --preset $env:GeneratedCMakeProfile
+      if: runner.os == 'Windows'
     - name: build
-      run: cmake --build --preset ${{matrix.setup.profile}} -j${{ steps.cpu-cores.outputs.count }}
+      run: cmake --build --preset $env:GeneratedCMakeProfile -j${{ steps.cpu-cores.outputs.count }}
+      if: runner.os == 'Windows'
     - name: run tests
-      run: ctest --preset ${{matrix.setup.profile}} -j --output-on-failure 
+      run: ctest --preset $env:GeneratedCMakeProfile -j --output-on-failure 
+      if: runner.os == 'Windows'
 
 
 

.gitignore

@@ -12,4 +12,6 @@ build
 *.out
 *.synctex.gz
 
-CMakeUserPresets.json
+CMakeUserPresets.json
+__pycache__/Build.cpython-310.pyc
+__pycache__/Setup.cpython-310.pyc

Build.py

@@ -2,11 +2,22 @@
 import subprocess
 import sys
 
-presets={
-    "linux": "conan-linux-x86_64-release",
-    "win32": "conan-windows-x86_64-release",
-    "darwin": "conan-macos-x86_64-release"
-}
+def get_preset():
+    preset = "conan-"
+    os = sys.platform
+    if os == "win32":
+        preset += "windows"
+    elif os == "linux":
+        preset += "linux"
+    elif os == "darwin":
+        preset += "macos"
+
+    preset += "-"
+    preset += Setup.get_arch()
+
+    preset += "-release"
+
+    return preset
 
 def build(preset):
     cmd=f"cmake --preset {preset}".split()
@@ -17,8 +28,9 @@ def build(preset):
 
 
 def main():
+    Setup.setup_profiles()
     Setup.conan_install_all(Setup.BuildMode.release)
-    build(presets[sys.platform])
+    build(get_preset())
 
 if __name__ == "__main__":
     main()

Setup.py

@@ -4,6 +4,7 @@
 import shutil
 from enum import Enum
 from argparse import ArgumentParser, ArgumentTypeError
+import platform
 
 
 class ArgTypeEnum(Enum):
@@ -23,18 +24,33 @@ class BuildMode(ArgTypeEnum, Enum):
     release = (1,)
     debug = 2
 
+def get_profile(os: str, arch: str, build_type: BuildMode):
+    profile = ""
+    if os == "win32":
+        profile += "windows"
+    elif os == "linux":
+        profile += "linux"
+    elif os == "darwin":
+        profile += "macos"
 
-build_profiles = {
-    "win32": "windows-release",
-    "linux": "linux-release",
-    "darwin": "macos-release",
-}
+    profile += "-"
 
-target_profiles = {
-    "win32": {"release": "windows-release", "debug": "windows-debug"},
-    "linux": {"release": "linux-release", "debug": "linux-debug"},
-    "darwin": {"release": "macos-release", "debug": "macos-debug"},
-}
+    if build_type == BuildMode.release:
+        profile += "release"
+    elif build_type == BuildMode.debug:
+        profile += "debug"
+
+    profile += "-"
+    profile += arch
+
+    return profile
+
+
+def get_arch():
+    arch = "x86_64"
+    if platform.machine() == "aarch64" or platform.machine() == "arm64":
+        arch = "armv8"
+    return arch
 
 
 def setup_profiles():
@@ -51,7 +67,8 @@ def conan_install(profile, additional_options=[], build_missing=False):
         "tools.cmake.cmake_layout:build_folder_vars=['settings.os','settings.arch','settings.build_type']"
     ]
 
-    build_profile = build_profiles[sys.platform]
+
+    build_profile = get_profile(sys.platform, get_arch(), BuildMode.release)
 
     cmd = f"conan install . -pr:h BSMPT/{profile} -pr:b BSMPT/{build_profile} ".split()
 
@@ -68,11 +85,10 @@ def conan_install(profile, additional_options=[], build_missing=False):
 
 
 def conan_install_all(mode: BuildMode, options=[], build_missing=False):
-    profiles = target_profiles[sys.platform]
     if mode == BuildMode.all or mode == BuildMode.release:
-        conan_install(profiles["release"], options, build_missing)
+        conan_install( get_profile(sys.platform, get_arch(), BuildMode.release) , options, build_missing)
     if mode == BuildMode.all or mode == BuildMode.debug:
-        conan_install(profiles["debug"], options, build_missing)
+        conan_install(get_profile(sys.platform, get_arch(), BuildMode.debug), options, build_missing)
 
 
 class ArgTypeEnum(Enum):

conanfile.py

@@ -51,7 +51,7 @@ def build_requirements(self):
 
         if self.options.EnableTests:
             self.test_requires("catch2/3.5.3")
-            self.test_requires("benchmark/1.6.1")
+            self.test_requires("benchmark/1.6.2")
 
     def system_requirements(self):
         if self.options.EnableCoverage:

profiles/BSMPT/linux-debug-armv8

@@ -0,0 +1,10 @@
+[settings]
+arch=armv8
+build_type=Debug
+compiler=gcc
+compiler.cppstd=gnu17
+compiler.libcxx=libstdc++11
+compiler.version=11
+os=Linux
+
+

profiles/BSMPT/linux-release-armv8

@@ -0,0 +1,9 @@
+[settings]
+arch=armv8
+build_type=Release
+compiler=gcc
+compiler.cppstd=gnu17
+compiler.libcxx=libstdc++11
+compiler.version=11
+os=Linux
+

profiles/BSMPT/macos-debug-armv8

@@ -0,0 +1,8 @@
+[settings]
+arch=armv8
+build_type=Debug
+compiler=apple-clang
+compiler.cppstd=gnu17
+compiler.libcxx=libc++
+compiler.version=13
+os=Macos

profiles/BSMPT/macos-release-armv8

@@ -0,0 +1,8 @@
+[settings]
+arch=armv8
+build_type=Release
+compiler=apple-clang
+compiler.cppstd=gnu17
+compiler.libcxx=libc++
+compiler.version=13
+os=Macos

test.txt

@@ -0,0 +1 @@
+A=conan-linux-x86_64-release