arm64 packaging

Author: tcaduser

.travis.yml

@@ -4,13 +4,24 @@ language: cpp
 matrix:
   include:
   - os: osx
-    env: COMPILER=clang
+    env:
+      - COMPILER=clang
+      - ARCH=x86_64
     osx_image: xcode10.1
+  - os: osx
+    env:
+      - COMPILER=clang
+      - ARCH=arm64
+    osx_image: xcode14.2
   - os: linux
     sudo: required
     dist: trusty
     services: docker
 
+addons:
+  homebrew:
+    update: false
+
 #https://github.com/travis-ci/travis-ci/issues/6893
 if: tag IS present
 
@@ -43,6 +54,11 @@ branches:
 #    fi
 
 before_script:
+  - export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      brew install cmake;
+      /usr/local/bin/pip3 install --upgrade pip;
+    fi
   # specifically for pypi deployment
   - export README_BASE_URL="https://github.com/devsim/symdiff/blob/${TRAVIS_TAG}"
 
@@ -51,7 +67,6 @@ script:
       ./scripts/build_docker_manylinux2014.sh ${TRAVIS_TAG};
     fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      source  ./scripts/install_miniconda_macos.sh;
       if [ "$COMPILER" == "gcc" ]; then
         ./scripts/build_macos.sh $COMPILER "${TRAVIS_TAG}";
       elif [ "$COMPILER" == "clang" ]; then

CMakeLists.txt

@@ -14,8 +14,8 @@ SET (SUBDIRS
 # superlu stuff
 SITE_NAME(HOSTNAME)
 MESSAGE("Hostname: ${HOSTNAME}")
-ADD_DEFINITIONS(-DSYMDIFF_VERSION_STRING=\"1.2.5\")
-ADD_DEFINITIONS(-DSYMDIFF_COPYRIGHT_YEAR=\"2010-2022\")
+ADD_DEFINITIONS(-DSYMDIFF_VERSION_STRING=\"1.2.6\")
+ADD_DEFINITIONS(-DSYMDIFF_COPYRIGHT_YEAR=\"2010-2023\")
 
 set(PROJECT_BIN_DIR ${PROJECT_SOURCE_DIR}/bin)
 set(PROJECT_SCRIPTS_DIR ${PROJECT_SOURCE_DIR}/scripts)

bdist_wheel/fix_macos_arch.py

@@ -0,0 +1,22 @@
+import wheel
+import wheel.bdist_wheel
+import sys
+
+try:
+    plat = wheel.bdist_wheel.get_platform('')
+except TypeError:
+    #TypeError: get_platform() takes 0 positional arguments but 1 was given
+    plat = wheel.bdist_wheel.get_platform()
+#
+#print(plat)
+
+for i in 'x86_64', 'arm64':
+  p = plat.find(i)
+  if p != -1:
+      prefix = plat[0:p]
+      break
+
+print(prefix+ sys.argv[1])
+#
+#
+#

bdist_wheel/setup.cfg

@@ -1,7 +1,8 @@
 [bdist_wheel]
 py-limited-api = cp36
+#plat-name=
 [metadata]
-version = 1.2.5
+version = 1.2.6
 classifiers =
         Development Status :: 5 - Production/Stable
         Intended Audience :: Science/Research

scripts/build_macos.sh

@@ -40,36 +40,52 @@ else
 fi
 
 
-#minimal conda environments to prevent linking against the wrong libraries
-if [ "${1}" = "gcc" ]
-then
-# now opt for explicit dll load of mkl
-conda create  -y --name python3_symdiff_build python=3 cmake nomkl
-fi
-
-#This version does not use pardiso
-if [ "${1}" = "clang" ]
-then
-conda create  -y --name python3_symdiff_build python=3 cmake nomkl
-fi
-source activate python3_symdiff_build
+##minimal conda environments to prevent linking against the wrong libraries
+#if [ "${1}" = "gcc" ]
+#then
+## now opt for explicit dll load of mkl
+#conda create  -y --name python3_symdiff_build python=3 cmake nomkl
+#fi
+#
+##This version does not use pardiso
+#if [ "${1}" = "clang" ]
+#then
+#conda create  -y --name python3_symdiff_build python=3 cmake nomkl
+#fi
+#source activate python3_symdiff_build
 
-export PYTHON3_BIN=python
-export PYTHON3_INCLUDE=$(python -c "from sysconfig import get_paths as gp; print(gp()['include'])")
+export PYTHON3_BIN=/usr/local/bin/python3
+export PIP_BIN=/usr/local/bin/pip3
+${PIP_BIN} install wheel
+export PYTHON3_INCLUDE=$(${PYTHON3_BIN} -c "from sysconfig import get_paths as gp; print(gp()['include'])")
 export PYTHON3_ARCHIVE=""
 
+
 # SYMDIFF build
 if [ "${1}" = "gcc" ]
 then
 (bash scripts/symdiff_macos.sh && cd osx_release && make -j4 && make test)
 elif [ "${1}" = "clang" ]
 then
-(bash  scripts/symdiff_macos.sh && cd osx_release && make -j4 && make test)
+if [ ! -z "${ARCH}" ]
+then
+  export ARCH_ARG="-DCMAKE_OSX_ARCHITECTURES=\"${ARCH}\""
+fi;
+#TODO test arch
+(bash  scripts/symdiff_macos.sh && cd osx_release && make -j4)
+if [ $ARCH == $(uname -m) ]
+then
+(cd osx_release && make test)
+fi
+#(bash  scripts/symdiff_macos.sh && cd osx_release && make -j4 && make test)
 fi
 
 (rsync -avP --exclude __pycache__ lib/symdiff bdist_wheel/)
 (rsync -avP --exclude __pycache__ LICENSE NOTICE README.md examples doc bdist_wheel)
-(cd bdist_wheel && pip wheel .)
+FULL_PLAT_NAME=$(${PYTHON3_BIN} bdist_wheel/fix_macos_arch.py ${ARCH})
+echo PACKAGING $FULL_PLAT_NAME
+(cd bdist_wheel &&  perl -p -i -e "s/^#plat-name.*/plat-name = ${FULL_PLAT_NAME}/" setup.cfg)
+(cd bdist_wheel && ${PIP_BIN} wheel .)
 (mv bdist_wheel/*.whl .)
 
 

scripts/symdiff_macos.sh

@@ -4,6 +4,7 @@ for TYPE in debug release; do
     NAME=osx_${TYPE}
     mkdir ${NAME}
     (cd $NAME; ${CMAKE} \
+        ${ARCH_ARG} \
         -DCMAKE_CXX_FLAGS:STRING="${CMAKE_CXX_FLAGS}" \
         -DCMAKE_BUILD_TYPE=${TYPE} \
         -DCMAKE_CXX_COMPILER=${CXX} \