Merge pull request #17 from MacPython/test_universal2

Test universal2

Author: Jeff Whitaker

.github/workflows/build-wheels.yml

@@ -47,13 +47,13 @@ jobs:
             os: ubuntu-latest
             platform: aarch64
           - python-version: "3.8"
-            os: macos-10.15
+            os: macos-latest  
             platform: x86_64
           - python-version: "3.9"
-            os: macos-10.15
+            os: macos-latest  
             platform: x86_64
           - python-version: "3.10"
-            os: macos-10.15
+            os: macos-latest   
             platform: x86_64
     env:
       REPO_DIR: netcdf4-python
@@ -89,8 +89,8 @@ jobs:
         if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi
         if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
         if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
-        # make universal2 wheels on macos 10.15 by cross-compiling
-        if [ "macos-10.15" == "${{ matrix.os }}" ]; then echo "PLAT=universal2" >> $GITHUB_ENV; fi
+        # make universal2 wheels on macos by cross-compiling 
+        if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "PLAT=universal2" >> $GITHUB_ENV; fi
 
     - name: Setup Special Environment variables for Linux AArch64
       if: ${{ matrix.platform == 'aarch64' }}

config.sh

@@ -14,48 +14,6 @@ export OPENSSL_ROOT=openssl-1.0.2u
 export OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
 export CURL_VERSION="7.75.0"
 
-#source h5py-wheels/config.sh
-
-# copied from h5py-wheels/config.sh
-
-function build_wheel {
-    if [ -z "$IS_OSX" ]; then
-        build_linux_wheel $@
-    else
-        build_osx_wheel $@
-    fi
-}
-
-function build_linux_wheel {
-    source multibuild/library_builders.sh
-    build_libs
-    # Add workaround for auditwheel bug:
-    # https://github.com/pypa/auditwheel/issues/29
-    local bad_lib="/usr/local/lib/libhdf5.so"
-    if [ -z "$(readelf --dynamic $bad_lib | grep RUNPATH)" ]; then
-        patchelf --set-rpath $(dirname $bad_lib) $bad_lib
-    fi
-    build_pip_wheel $@
-}
-
-function build_osx_wheel {
-    local repo_dir=${1:-$REPO_DIR}
-    export CC=clang
-    export CXX=clang++
-    install_pkg_config
-    # Build libraries
-    source multibuild/library_builders.sh
-    export ARCH_FLAGS="-arch x86_64"
-    export CFLAGS=$ARCH_FLAGS
-    export CXXFLAGS=$ARCH_FLAGS
-    export FFLAGS=$ARCH_FLAGS
-    export LDFLAGS=$ARCH_FLAGS
-    build_libs
-    # Build wheel
-    export LDFLAGS="$ARCH_FLAGS -Wall -undefined dynamic_lookup -bundle"
-    export LDSHARED="$CC $LDFLAGS"
-    build_pip_wheel "$repo_dir"
-}
 
 function build_curl2 {
     if [ -e curl-stamp ]; then return; fi
@@ -77,6 +35,76 @@ function build_curl2 {
     touch curl-stamp
 }
 
+function build_hdf5 {
+    if [ -e hdf5-stamp ]; then return; fi
+    build_zlib
+    # libaec is a drop-in replacement for szip
+    build_libaec
+    local hdf5_url=https://support.hdfgroup.org/ftp/HDF5/releases
+    local short=$(echo $HDF5_VERSION | awk -F "." '{printf "%d.%d", $1, $2}')
+    fetch_unpack $hdf5_url/hdf5-$short/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz
+    
+    if [[ ! -z "IS_OSX"  && "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
+    cd hdf5-$HDF5_VERSION
+    # from https://github.com/conda-forge/hdf5-feedstock/commit/2cb83b63965985fa8795b0a13150bf0fd2525ebd
+    export ac_cv_sizeof_long_double=8
+    export hdf5_cv_ldouble_to_long_special=no
+    export hdf5_cv_long_to_ldouble_special=no
+    export hdf5_cv_ldouble_to_llong_accurate=yes
+    export hdf5_cv_llong_to_ldouble_correct=yes
+    export hdf5_cv_disable_some_ldouble_conv=no
+    export hdf5_cv_system_scope_threads=yes
+    export hdf5_cv_printf_ll="l"
+    export PAC_FC_MAX_REAL_PRECISION=15
+    export PAC_C_MAX_REAL_PRECISION=17
+    export PAC_FC_ALL_INTEGER_KINDS="{1,2,4,8,16}"
+    export PAC_FC_ALL_REAL_KINDS="{4,8}"
+    export H5CONFIG_F_NUM_RKIND="INTEGER, PARAMETER :: num_rkinds = 2"
+    export H5CONFIG_F_NUM_IKIND="INTEGER, PARAMETER :: num_ikinds = 5"
+    export H5CONFIG_F_RKIND="INTEGER, DIMENSION(1:num_rkinds) :: rkind = (/4,8/)"
+    export H5CONFIG_F_IKIND="INTEGER, DIMENSION(1:num_ikinds) :: ikind = (/1,2,4,8,16/)"
+    export PAC_FORTRAN_NATIVE_INTEGER_SIZEOF="                    4"
+    export PAC_FORTRAN_NATIVE_INTEGER_KIND="           4"
+    export PAC_FORTRAN_NATIVE_REAL_SIZEOF="                    4"
+    export PAC_FORTRAN_NATIVE_REAL_KIND="           4"
+    export PAC_FORTRAN_NATIVE_DOUBLE_SIZEOF="                    8"
+    export PAC_FORTRAN_NATIVE_DOUBLE_KIND="           8"
+    export PAC_FORTRAN_NUM_INTEGER_KINDS="5"
+    export PAC_FC_ALL_REAL_KINDS_SIZEOF="{4,8}"
+    export PAC_FC_ALL_INTEGER_KINDS_SIZEOF="{1,2,4,8,16}"
+    curl -sLO https://github.com/conda-forge/hdf5-feedstock/raw/2cb83b63965985fa8795b0a13150bf0fd2525ebd/recipe/patches/osx_cross_configure.patch
+    curl -sLO https://github.com/conda-forge/hdf5-feedstock/raw/2cb83b63965985fa8795b0a13150bf0fd2525ebd/recipe/patches/osx_cross_fortran_src_makefile.patch
+    curl -sLO https://github.com/conda-forge/hdf5-feedstock/raw/2cb83b63965985fa8795b0a13150bf0fd2525ebd/recipe/patches/osx_cross_hl_fortran_src_makefile.patch
+    curl -sLO https://github.com/conda-forge/hdf5-feedstock/raw/2cb83b63965985fa8795b0a13150bf0fd2525ebd/recipe/patches/osx_cross_src_makefile.patch
+    patch -p0 < osx_cross_configure.patch
+    patch -p0 < osx_cross_fortran_src_makefile.patch
+    patch -p0 < osx_cross_hl_fortran_src_makefile.patch
+    patch -p0 < osx_cross_src_makefile.patch
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BUILD_PREFIX/lib 
+    ./configure --without-szlib --prefix=$BUILD_PREFIX --enable-threadsafe --enable-unsupported --with-pthread=yes --enable-build-mode=production  --host=aarch64-apple-darwin --enable-tests=no
+    mkdir -p native-build/bin
+    cd native-build/bin
+    pwd
+    clang ../../src/H5detect.c -I ../../src/ -o H5detect
+    clang ../../src/H5make_libsettings.c -I ../../src/ -o H5make_libsettings
+    ls -l
+    cd ../..
+    export PATH=$(pwd)/native-build/bin:$PATH
+    make -j4
+    make install
+    cd ..
+    touch hdf5-stamp
+    else
+    (cd hdf5-$HDF5_VERSION \
+        && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BUILD_PREFIX/lib \
+        && ./configure --with-szlib=$BUILD_PREFIX --prefix=$BUILD_PREFIX \
+        --enable-threadsafe --enable-unsupported --with-pthread=yes \
+        && make -j4 \
+        && make install)
+    touch hdf5-stamp
+    fi
+}
+
 function build_libs {
     build_hdf5
     build_curl2
@@ -86,6 +114,12 @@ function build_libs {
     build_netcdf
 }
 
+function pre_build {
+    # Any stuff that you need to do before you start building the wheels
+    # Runs in the root directory of this repository.
+    build_libs
+}
+
 function run_tests {
     # Runs tests on installed distribution from an empty directory
     pwd