typo, cleanup, simplify

Author: mattip

.github/workflows/posix.yml

@@ -13,7 +13,6 @@ on:
 
 env:
   OPENBLAS_COMMIT: "v0.3.30-349-gf6df9beb"
-  MACOSX_DEPLOYMENT_TARGET: 10.9
 
 jobs:
   build:

pyproject.toml

@@ -46,7 +46,6 @@ repair-wheel-command = "bash ci-repair-wheel.sh {dest_dir} {wheel}"
 test-command = "cd {package} && bash ci-test.sh "
 environment-pass = [
   "OPENBLAS_COMMIT",
-  "MACOSX_DEPLOYMENT_TARGET",
   "NIGHTLY",
   "MB_ML_LIBC",
   "MB_ML_VER",

tools/build_steps.sh

@@ -47,6 +47,7 @@ function before_build {
         which ${FC}
         ${FC} --version
         local libdir=/opt/gfortran/gfortran-darwin-${PLAT}-native/lib
+        export DYLD_LIBRARY_PATH=$libdir:$DYLD_LIBRARY_PATH
         export FFLAGS="-L${libdir} -Wl,-rpath,${libdir}"
 
         # Deployment target set by gfortran_utils
@@ -159,8 +160,8 @@ function do_build_lib {
         Darwin-x86_64)
             local bitness=64
             local target="CORE2"
-            export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             CFLAGS="$CFLAGS -arch x86_64"
+            MACOSX_DEPLOYMENT_TARGET="10.9"
             export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
             local dynamic_list="CORE2 NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
             ;;
@@ -172,8 +173,8 @@ function do_build_lib {
         Linux-aarch64)
             local bitness=64
             local target="ARMV8"
-            # manylinux2014 image uses gcc-10, which miscompiles ARMV8SVE and up
             if [ "$MB_ML_VER" == "2014" ]; then
+                # manylinux2014 image uses gcc-10, which miscompiles ARMV8SVE and up
                 echo setting DYNAMIC_LIST for manylinux2014 to ARMV8 only
                 local dynamic_list="ARMV8"
             fi
@@ -184,7 +185,6 @@ function do_build_lib {
             CFLAGS="$CFLAGS -ftrapping-math -mmacos-version-min=11.0"
             MACOSX_DEPLOYMENT_TARGET="11.0"
             export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
-            export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             ;;
         *-s390x)
             local bitness=64

tools/gfortran_utils.sh

@@ -16,117 +16,32 @@
 
 # Bash utilities for use with gfortran
 
-ARCHIVE_SDIR="${ARCHIVE_SDIR:-archives}"
-
-GF_UTIL_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-function get_distutils_platform {
-    # Report platform as in form of distutils get_platform.
-    # This is like the platform tag that pip will use.
-    # Modify fat architecture tags on macOS to reflect compiled architecture
-
-    # Deprecate this function once get_distutils_platform_ex is used in all
-    # downstream projects
-    local plat=$1
-    case $plat in
-        i686|x86_64|arm64|universal2|intel|aarch64|s390x|ppc64le) ;;
-        *) echo Did not recognize plat $plat; return 1 ;;
-    esac
-    local uname=${2:-$(uname)}
-    if [ "$uname" != "Darwin" ]; then
-        if [ "$plat" == "intel" ]; then
-            echo plat=intel not allowed for Manylinux
-            return 1
-        fi
-        echo "manylinux1_$plat"
-        return
-    fi
-    # macOS 32-bit arch is i386
-    [ "$plat" == "i686" ] && plat="i386"
-    local target=$(echo $MACOSX_DEPLOYMENT_TARGET | tr .- _)
-    echo "macosx_${target}_${plat}"
-}
-
-function get_distutils_platform_ex {
-    # Report platform as in form of distutils get_platform.
-    # This is like the platform tag that pip will use.
-    # Modify fat architecture tags on macOS to reflect compiled architecture
-    # For non-darwin, report manylinux version
-    local plat=$1
-    local mb_ml_ver=${MB_ML_VER:-1}
-    case $plat in
-        i686|x86_64|arm64|universal2|intel|aarch64|s390x|ppc64le) ;;
-        *) echo Did not recognize plat $plat; return 1 ;;
-    esac
-    local uname=${2:-$(uname)}
-    if [ "$uname" != "Darwin" ]; then
-        if [ "$plat" == "intel" ]; then
-            echo plat=intel not allowed for Manylinux
-            return 1
-        fi
-        echo "manylinux${mb_ml_ver}_${plat}"
-        return
-    fi
-    # macOS 32-bit arch is i386
-    [ "$plat" == "i686" ] && plat="i386"
-    local target=$(echo $MACOSX_DEPLOYMENT_TARGET | tr .- _)
-    echo "macosx_${target}_${plat}"
-}
-
-function get_macosx_target {
-    # Report MACOSX_DEPLOYMENT_TARGET as given by distutils get_platform.
-    python3 -c "import sysconfig as s; print(s.get_config_vars()['MACOSX_DEPLOYMENT_TARGET'])"
-}
-
-function check_gfortran {
-    # Check that gfortran exists on the path
-    if [ -z "$(which gfortran)" ]; then
-        echo Missing gfortran
-        exit 1
-    fi
-}
-
-function get_gf_lib_for_suf {
-    local suffix=$1
-    local prefix=$2
-    local plat=${3:-$PLAT}
-    local uname=${4:-$(uname)}
-    if [ -z "$prefix" ]; then echo Prefix not defined; exit 1; fi
-    local plat_tag=$(get_distutils_platform_ex $plat $uname)
-    if [ -n "$suffix" ]; then suffix="-$suffix"; fi
-    local fname="$prefix-${plat_tag}${suffix}.tar.gz"
-    local out_fname="${ARCHIVE_SDIR}/$fname"
-    [ -s $out_fname ] || (echo "$out_fname is empty"; exit 24)
-    echo "$out_fname"
-}
-
 if [ "$(uname)" == "Darwin" ]; then
-    mac_target=${MACOSX_DEPLOYMENT_TARGET:-$(get_macosx_target)}
-    export MACOSX_DEPLOYMENT_TARGET=$mac_target
-    # Keep this for now as some builds might depend on this being
-    # available before install_gfortran is called
-    export GFORTRAN_SHA=c469a420d2d003112749dcdcbe3c684eef42127e
     # Set SDKROOT env variable if not set
     export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
 
     function download_and_unpack_gfortran {
-	local arch=$1
-	local type=$2
-        curl -L -O https://github.com/isuruf/gcc/releases/download/gcc-11.3.0-2/gfortran-darwin-${arch}-${type}.tar.gz
-	case ${arch}-${type} in
-	    arm64-native)
-	        export GFORTRAN_SHA=0d5c118e5966d0fb9e7ddb49321f63cac1397ce8
-		;;
-	    arm64-cross)
-		export GFORTRAN_SHA=527232845abc5af21f21ceacc46fb19c190fe804
-		;;
-	    x86_64-native)
-		export GFORTRAN_SHA=c469a420d2d003112749dcdcbe3c684eef42127e
-		;;
-	    x86_64-cross)
-		export GFORTRAN_SHA=107604e57db97a0ae3e7ca7f5dd722959752f0b3
-		;;
-	esac
+        local arch=$1
+        local type=$2
+            curl -L -O https://github.com/isuruf/gcc/releases/download/gcc-11.3.0-2/gfortran-darwin-${arch}-${type}.tar.gz
+        case ${arch}-${type} in
+            arm64-native)
+                export GFORTRAN_SHA=0d5c118e5966d0fb9e7ddb49321f63cac1397ce8
+            ;;
+            arm64-cross)
+                export GFORTRAN_SHA=527232845abc5af21f21ceacc46fb19c190fe804
+            ;;
+            x86_64-native)
+                export GFORTRAN_SHA=c469a420d2d003112749dcdcbe3c684eef42127e
+            ;;
+            x86_64-cross)
+                export GFORTRAN_SHA=107604e57db97a0ae3e7ca7f5dd722959752f0b3
+            ;;
+            *)
+                echo unknown ${arch}-${type}
+                exit 1
+            ;;
+        esac
         if [[ "$(shasum gfortran-darwin-${arch}-${type}.tar.gz)" != "${GFORTRAN_SHA}  gfortran-darwin-${arch}-${type}.tar.gz" ]]; then
             echo "shasum mismatch for gfortran-darwin-${arch}-${type}"
             exit 1
@@ -140,7 +55,6 @@ if [ "$(uname)" == "Darwin" ]; then
             tar -xvf gfortran-darwin-${arch}-${type}.tar.gz
             rm gfortran-darwin-${arch}-${type}.tar.gz
         popd
-	fi
     }
 
     function install_arm64_cross_gfortran {
@@ -156,24 +70,13 @@ if [ "$(uname)" == "Darwin" ]; then
     }
     function install_gfortran {
         download_and_unpack_gfortran $(uname -m) native
-        check_gfortran
         if [[ "${PLAT:-}" == "universal2"]]; then
             install_arm64_cross_gfortran
         fi
     }
 
-    function get_gf_lib {
-        # Get lib with gfortran suffix
-        get_gf_lib_for_suf "gf_${GFORTRAN_SHA:0:7}" $@
-    }
 else
     function install_gfortran {
         # No-op - already installed on manylinux image
-        check_gfortran
-    }
-
-    function get_gf_lib {
-        # Get library with no suffix
-        get_gf_lib_for_suf "" $@
     }
 fi