ARM build configuration (#165)

* added arm configuration

* changed image

* changed docker to machine

* install git as sudo

* fixed system-setup.py

* update dependencies

* increased timeout

* running ARM on tiny-build flow

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

Author: GuyAv46

.circleci/config.yml

@@ -59,9 +59,17 @@ commands:
       - run:
           name: basic install
           command: |
-            apt-get update
+            apt-get update --fix-missing
             apt-get install -y git
 
+  setup-ubuntu-sudo:
+    steps:
+      - run:
+          name: basic install
+          command: |
+            sudo apt-get update --fix-missing
+            sudo apt-get install -y git
+
   setup-centos:
     steps:
       - run:
@@ -170,6 +178,14 @@ jobs:
       - setup-centos
       - tiny-build-steps
 
+  build-arm:
+    resource_class: arm.large
+    machine:
+      image: ubuntu-2004:current
+    steps:
+      - setup-ubuntu-sudo
+      - tiny-build-steps
+
   build-macos:
       macos:
         xcode: 11.6.0
@@ -342,7 +358,7 @@ workflows:
           <<: *on-any-branch
       - build-rocky8:
           <<: *on-any-branch
-      - build-rocky8:
+      - build-arm:
           <<: *on-any-branch
       - build-macos:
           <<: *on-any-branch

pyproject.toml

@@ -28,15 +28,15 @@ classifiers = [
 python = "^3.7"
 
 [tool.poetry.dev-dependencies]
-numpy = "1.21"
-tox = "^3.24.1"
+numpy = "^1.21"
+tox = "^3.25.0"
 tox-poetry = "^0.4.0"
 hnswlib = "^0.5.2"
 pytest = "^6.2.4"
-scipy = "^1.5.4"
-h5py = "^3.6.0"
+scipy = "^1.6"
+h5py = "^3.7.0"
 pybind11 = {path = "deps/pybind11"}
-rltest = "0.4.2"
+rltest = "0.5.4"
 
 
 [build-system]

sbin/requirements.txt

@@ -1,4 +1,4 @@
-pip>=21.0
-poetry>=1.1.8
-tox>=3.24.2
-tox-poetry>=0.4.0
+pip>=21.1
+poetry>=1.1.13
+tox>=3.25.0
+tox-poetry>=0.4.1

sbin/system-setup.py

@@ -13,40 +13,42 @@
 #----------------------------------------------------------------------------------------------
 
 class VecSimSetup(paella.Setup):
-    def __init__(self, nop=False):
-        paella.Setup.__init__(self, nop)
+    def __init__(self, args):
+        paella.Setup.__init__(self, args.nop)
 
     def common_first(self):
         self.install_downloaders()
-        self.pip_install("wheel")
-        self.pip_install("setuptools --upgrade")
 
+        self.run("%s/bin/enable-utf8" % READIES, sudo=self.os != 'macos')
         self.install("git")
 
-        self.run("%s/bin/enable-utf8" % READIES)
-        self.run("%s/bin/getcmake" % READIES)
-
     def debian_compat(self):
         self.run("%s/bin/getgcc --modern" % READIES)
-        self.install("python3-dev clang-format valgrind")
+        self.install("python3-dev valgrind")
 
     def redhat_compat(self):
         self.install("redhat-lsb-core")
+        self.run("%s/bin/getepel" % READIES, sudo=True)
+        self.install("libatomic")
+
         self.run("%s/bin/getgcc --modern" % READIES)
 
     def fedora(self):
+        self.install("libatomic")
         self.run("%s/bin/getgcc --modern" % READIES)
 
     def macos(self):
         self.install_gnu_utils()
         self.run("%s/bin/getgcc --modern" % READIES)
-        self.install("clang-format")
 
     def linux_last(self):
         self.run("%s/bin/getclang" % READIES)
 
     def common_last(self):
-        self.run("python3 %s/bin/getrmpytools" % READIES)
+        self.run("{PYTHON} {READIES}/bin/getcmake --usr".format(PYTHON=self.python, READIES=READIES),
+                 sudo=self.os != 'macos')
+        self.run("{PYTHON} {READIES}/bin/getrmpytools --reinstall".format(PYTHON=self.python, READIES=READIES))
+        self.run("%s/bin/getclang --format" % READIES)
         self.pip_install("-r %s/sbin/requirements.txt" % ROOT)
 
 #----------------------------------------------------------------------------------------------
@@ -55,4 +57,4 @@ def common_last(self):
 parser.add_argument('-n', '--nop', action="store_true", help='no operation')
 args = parser.parse_args()
 
-VecSimSetup(nop = args.nop).setup()
+VecSimSetup(args).setup()

src/VecSim/spaces/CMakeLists.txt

@@ -52,7 +52,7 @@ target_link_libraries(VectorSimilaritySpaces VectorSimilaritySpaces_no_optimizat
 
 if(NOT APPLE)
 	target_link_libraries(VectorSimilaritySpaces cpu_features)
-	elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
 	target_link_libraries(VectorSimilaritySpaces cpu_features)
 endif()