Merge branch 'master' of github.com:swift-lang/swift-t

Author: j-woz

c-utils/code/configure.ac

@@ -51,6 +51,7 @@ AC_PROG_CC
 
 USE_CC=$( which $CC )
 AC_MSG_RESULT([using CC=$USE_CC])
+AC_MSG_RESULT([CC version: $( $CC --version ) ])
 
 # Checks for header files
 AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h unistd.h])

dev/build/init-settings.sh

@@ -13,5 +13,10 @@ then
 fi
 
 cp ${THIS}/swift-t-settings.sh.template ${THIS}/swift-t-settings.sh
-echo "Created ${THIS}/swift-t-settings.sh"
-echo "You may edit swift-t-settings.sh before building."
+
+if (( ${CONDA_BUILD:-0} == 0 ))
+then
+  # This output is suppressed during a conda build
+  echo "Created ${THIS}/swift-t-settings.sh"
+  echo "You may edit swift-t-settings.sh before building."
+fi

dev/conda/README.adoc

@@ -80,6 +80,7 @@ When testing an installation:
 Setup:
 
 * Run `setup-conda.sh` to setup a working Conda environment
+** If needed, `$ conda install autoconf automake ant`
 * Run the Swift/T `dev/release/make-release-pkg.zsh` script to
   create the "exported" Swift/T source tree in `$TMP/distro`,
   where `$TMP` defaults to `/tmp`.
@@ -89,7 +90,7 @@ Setup:
 
 Loop:
 
-* Run `conda-platform.sh`.  See notes there.
+* Run `conda-build.sh [PLATFORM]`.  See notes there.
 ** Provide `-r` to build with R
 * Check `conda-build.log` (`LOG`) for errors.
 * Add debug output to `build.sh` as needed to diagnose problems.
@@ -171,13 +172,13 @@ We restrict our M4 usage to:
 * `m4_include()`: does simple file insertion
 * `m4_ifelse()`: does conditional substitution +
 Syntax: `m4_ifelse(VALUE1, VALUE2, TEXT1)` ⇒ _if (VALUE1 == VALUE2) then insert TEXT1_
-* `getenv()`: substitutes in an environment variable value
+* `m4_getenv()`: substitutes in an environment variable value
 
-See `dev/conda/common.m4` for `getenv()` - this is a different script from the `common.m4' for the Turbine submit scripts due to newline requirements.
+See `dev/conda/common.m4` for `m4_getenv()` - this is a different script from the `common.m4' for the Turbine submit scripts due to Spack packaging requirements.
 
 Example:
 ----
-m4_ifelse(getenv(ENABLE_R),`1',m4_include(pkgs-R.yaml))
+m4_ifelse(m4_getenv(ENABLE_R),`1',m4_include(pkgs-R.yaml))
 ----
 means: if `$ENABLE_R == 1`, include file `pkgs-R.yaml` here.
 

dev/conda/build-generic.sh

@@ -20,6 +20,11 @@ set -o pipefail
 # PREFIX is provided by Conda
 # ENABLE_R may be set by meta.yaml
 
+# Try to force everything to stdout for correct ordering
+# Also do this in PLATFORM/build.sh
+# Works on Mac: 2025-10-27
+exec 2>&1
+
 log()
 {
   echo "build-generic.sh:" ${*}
@@ -152,18 +157,26 @@ fi
 # Edit swift-t-settings
 ${SED_I[@]} -f $SETTINGS_SED swift-t-settings.sh
 
+log "check aclocal"
+which  aclocal # 2>&1
+
+
 # Build it!
 # Merge output streams to try to prevent buffering
 #       problems with conda build
 {
   echo
-  # Anaconda Autoconf 2.72 is buggy
+  log "check aclocal"
+  which  aclocal
   log "build tools:"
   which m4 autoreconf aclocal autom4te mpicc
-  m4 --version
+  m4 --version         | head -1
+  # Anaconda Autoconf 2.72 is buggy
   autoreconf --version | head -1
   log "mpicc show:"
   mpicc -show
+  log "mpicc version:"
+  mpicc --version
   echo
   log "BUILD SWIFT-T START: $( date '+%Y-%m-%d %H:%M:%S' )"
   ./build-swift-t.sh -vv 2>&1

dev/conda/common.m4

@@ -4,5 +4,5 @@ dnl This file must have a newline at the end for OSX.
 dnl Simply remove this text:
 m4_define(`COMMENT', `')dnl
 dnl This simply does environment variable substition when m4 runs:
-m4_define(`getenv',  `m4_esyscmd(printf -- "$`$1'")')dnl
+m4_define(`m4_getenv',  `m4_esyscmd(printf -- "$`$1'")')dnl
 m4_divert

dev/conda/conda-build.sh

@@ -4,14 +4,13 @@ setopt PIPE_FAIL
 
 # CONDA BUILD
 # Generic wrapper around `conda build'
-# Called by platform/conda-platform.sh
 # Generates meta.yaml and runs `conda build'
-# Generates settings.sed for the Swift/T build
+# Generates settings.sed to edit swift-t-settings.sh
 # Many exported environment variables here
 #      are substituted into meta.yaml
 # This script runs in the CONDA_PLATFORM subdirectory
 #      and should not change directories
-# A LOG is produced named platform/conda-build.log
+# A LOG is produced named CONDA_PLATFORM/conda-build.log
 # You can only run 1 job concurrently per Anaconda installation
 #     because of the log and
 #     because of meta.yaml
@@ -23,9 +22,10 @@ help()
   cat <<END
 
 Options:
-   conda-build.sh [-Cr] PLATFORM
-   -C configure-only- generate meta.yaml and settings.sed, then stop
-   -r for the R version
+   conda-build.sh [-C] [-r RV] PLATFORM
+   -C    : configure-only-
+           generate meta.yaml and settings.sed, then stop
+   -r RV : enable R version RV
 
 END
   exit
@@ -59,8 +59,9 @@ log "CONDA_PLATFORM:  $CONDA_PLATFORM ${*}"
 source $SWIFT_T_TOP/dev/get-versions.sh
 export SWIFT_T_VERSION
 log "SWIFT/T VERSION: $SWIFT_T_VERSION"
-# Sets PYTHON_VERSION:
+# Setenvs PYTHON_VERSION: passed into meta.yaml: e.g. "3.12.11"
 source $DEV_CONDA/get-python-version.sh
+log "PYTHON_VERSION: $PYTHON_VERSION   SERIES: $PYTHON_SERIES"
 # Optionally set R_VERSION from user argument:
 if (( ${#R} )) export R_VERSION=${R[2]}
 
@@ -116,13 +117,17 @@ if (( ! ${#R} )) {
   export ENABLE_R=1
   export PKG_NAME="swift-t-r"
 }
+log "PKG_NAME: $PKG_NAME"
 
 # Default dependencies:
 export USE_ANT=1
 export USE_GCC=1
+export USE_CLANG=0
 export USE_TK=0
 export USE_ZLIB=0
 export USE_ZSH=1
+export SPEC_MPICH="mpich-mpicc"
+export SPEC_CLANG=""
 
 # Allow platform to modify dependencies
 source $DEV_CONDA/$CONDA_PLATFORM/deps.sh

dev/conda/conda-install.sh

@@ -82,48 +82,30 @@ then
   return 1
 fi
 
-# Get 2nd token from the version string:
-PV=( $( python --version ) )
-PV=${PV[2]}
+source $DEV_CONDA/get-python-version.sh
 
-print "using python:" $( which python ) "(v$PV)"
+print "using python:" $( which python ) $PYTHON_VERSION
 print "using conda: " $( which conda )
 
 # conda env list
 
 # Defaults:
+# A SPEC is a 'package==version' specifier.
+#        The version may be omitted if we are flexible.
 USE_ANT=1
 USE_GCC=1
 USE_ZSH=1
+SPEC_CLANG=""
+SPEC_MPICH="mpich"
+SPEC_PYTHON="python"
+TK="tk"
 
 # Load platform-specific settings:
-source $DEV_CONDA/$CONDA_PLATFORM/deps.sh
-
-# Auto-configuration
-# PINs are version pins applied to the package names
-CLANG_PIN=""
-PIN_PV=""
-if [[ $CONDA_PLATFORM == "osx-arm64" ]] {
-  SOLVER=( --solver classic )
-  # Pin Python version for these versions:
-  # On GitHub, Conda will try to change them!
-  case $PV {
-    3.9*)  PIN_PV="==3.9.7" ;;
-    3.10*)                  ;& # Fall-through
-    3.11*)                  ;& # Fall-through
-    3.12*)                  ;& # Fall-through
-    3.13*) PIN_PV="==$PV"   ;;
-    *)     print "conda-install.sh: unsupported Python version: '$PV'"
-           exit 1 ;;
-  }
-  # Pin Clang for everything but Python 3.9
-       # In Py 3.9, 18 => 18.1.7
-  PIN_CLANG="-18==18.1.8"
-  # if [[ $PV =~ 3.9 ]] {
-  #      PIN_CLANG="-18"
-  #  #     SOLVER=()
-  # }
-}
+if ! source $DEV_CONDA/$CONDA_PLATFORM/deps.sh
+then
+  abortf "conda-install.sh: failed during source %s\n" \
+         $DEV_CONDA/$CONDA_PLATFORM/deps.sh
+fi
 
 # Build dependency list:
 LIST=()
@@ -132,16 +114,18 @@ if (( USE_GCC )) LIST+=gcc
 if (( USE_ZSH )) LIST+=zsh
 LIST+=(
   autoconf
+  $SPEC_CLANG
   make
-  mpich-mpicc
+  $SPEC_MPICH
   openjdk
   # May need to pin version:
-  "python$PIN_PV"
+  $SPEC_PYTHON
   swig
+  $SPEC_TK
 )
 
-# # Needed for _strstr issue:
-if [[ $CONDA_PLATFORM == "osx-arm64" ]] LIST+=( "clang$PIN_CLANG" )
+# # # Needed for _strstr issue:
+# if [[ $CONDA_PLATFORM == "osx-arm64" ]] LIST+=( "clang$PIN_CLANG" )
 
 # Needed for libstdc++ GLIBCXX version issue on GCE Jenkins:
 if [[ ${JENKINS_HOME:-} != "" ]] LIST+=( "gcc=14" )

dev/conda/get-python-version.sh

@@ -6,3 +6,17 @@ T=( $( python --version ) )
 print "get-python-version.sh: Python version detected: $T"
 
 export PYTHON_VERSION=${T[2]}
+
+# ZSH syntax: Split e.g. "3.12.7" into ( 3 12 7 )
+VS=( ${(s:.:)PYTHON_VERSION} )
+
+# Python version, just major.minor: e.g. "3.12"
+export PYTHON_VERSION_MM="${VS[1]}.${VS[2]}"
+
+# Get the next Python version (as an upper bound for meta.yaml)
+NEXT_MINOR=$[ ${VS[2]} + 1 ]
+export PYTHON_NEXT_MM="${VS[1]}.${NEXT_MINOR}"
+
+# Current Python series in meta.yaml range format:
+# E.g., >=3.12,<3.13
+export PYTHON_SERIES=">=${PYTHON_VERSION_MM},<${PYTHON_NEXT_MM}"

dev/conda/meta-template.yaml

@@ -1,59 +1,66 @@
 COMMENT(
 # META TEMPLATE YAML
 # Will be filtered into PLATFORM/meta.yaml by conda-build.sh:m4
+# Any m4_getenv() values are substituted when m4 runs!
 )
 
 # Date that this meta.yaml was filtered from meta-template.yaml:
-# DATE: getenv(DATE)
+# DATE: m4_getenv(DATE)
 
-{% set name    = "getenv(PKG_NAME)" %}
-{% set version = "getenv(SWIFT_T_VERSION)" %}
+{% set name    = "m4_getenv(PKG_NAME)" %}
+{% set version = "m4_getenv(SWIFT_T_VERSION)" %}
 {% set major   = version.rpartition('.')[0] %}
 
 package:
   name:    {{ name|lower }}
   version: {{ version }}
 
 source:
-  path: getenv(DISTRO)/swift-t-{{ version }}/swift-t-{{ version }}
+  path: m4_getenv(DISTRO)/swift-t-{{ version }}/swift-t-{{ version }}
 
 build:
   number: 1
   # Environment variables for build.sh must be listed here,
   # normal environment inheritance does not happen!
   script_env:
-    - CONDA_PLATFORM=getenv(CONDA_PLATFORM)
-    - GITHUB_ACTIONS=getenv(GITHUB_ACTIONS)
-m4_ifelse(getenv(ENABLE_R),`1',m4_include(env-R.yaml))
+    - CONDA_PLATFORM=m4_getenv(CONDA_PLATFORM)
+    - GITHUB_ACTIONS=m4_getenv(GITHUB_ACTIONS)
+m4_ifelse(m4_getenv(ENABLE_R),`1',m4_include(env-R.yaml))
 
 # Remember to sync any dependency changes here with conda-install.sh
 requirements:
   build:
+    - python m4_getenv(PYTHON_SERIES)
     # Anaconda Autoconf 2.72 is buggy 2025-05-12
     - autoconf==2.71
+    # Automake is needed on osx-arm64: 2025-10-27
+    - automake
     - make
     - openjdk>=17  # Security issue in Java < 11.72.19
-    - mpich-mpicc
-    - python==getenv(PYTHON_VERSION)
+    - m4_getenv(SPEC_MPICH)
     - swig
-m4_ifelse(getenv(USE_ANT),`1',m4_include(pkgs-ant.yaml))
-m4_ifelse(getenv(USE_GCC),`1',m4_include(pkgs-gcc.yaml))
-m4_ifelse(getenv(USE_TK), `1',m4_include(pkgs-tk.yaml))
-m4_ifelse(getenv(USE_ZSH),`1',m4_include(pkgs-zsh.yaml))
-m4_ifelse(getenv(ENABLE_R),`1',m4_include(pkgs-R.yaml))
+m4_ifelse(m4_getenv(USE_ANT),  `1',m4_include(pkgs-ant.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_CLANG),`1',m4_include(pkgs-clang.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_GCC),  `1',m4_include(pkgs-gcc.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_TK),   `1',m4_include(pkgs-tk.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_ZSH),  `1',m4_include(pkgs-zsh.yaml))m4_dnl
+m4_ifelse(m4_getenv(ENABLE_R), `1',m4_include(pkgs-R.yaml))m4_dnl
   run:
-    - mpich-mpicc
-    - openjdk>=17  # Security issue in Java < 11.72.19
-    - python==getenv(PYTHON_VERSION)
+    - python m4_getenv(PYTHON_SERIES)
+    - openjdk>=17
+    - m4_getenv(SPEC_MPICH)
     - swig
-m4_ifelse(getenv(USE_GCC),`1',m4_include(pkgs-gcc.yaml))
-m4_ifelse(getenv(USE_TK), `1',m4_include(pkgs-tk.yaml))
-m4_ifelse(getenv(USE_ZSH),`1',m4_include(pkgs-zsh.yaml))
-m4_ifelse(getenv(ENABLE_R),`1',m4_include(pkgs-R.yaml))
+m4_ifelse(m4_getenv(USE_CLANG),`1',m4_include(pkgs-clang.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_GCC),  `1',m4_include(pkgs-gcc.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_TK),   `1',m4_include(pkgs-tk.yaml))m4_dnl
+m4_ifelse(m4_getenv(USE_ZSH),  `1',m4_include(pkgs-zsh.yaml))m4_dnl
+m4_ifelse(m4_getenv(ENABLE_R), `1',m4_include(pkgs-R.yaml))m4_dnl
 
 test:
   commands:
+    - which swift-t
     - swift-t -v
+    - swift-t -E 'trace(42);'
 
 about:
   home: http://swift-lang.org/Swift-T

dev/conda/osx-arm64/build.sh

@@ -1,8 +1,11 @@
-
 # osx-arm64 BUILD SH
 # Simply calls build-generic.
 # `conda build` calls this as Bash.
 
+exec 2>&1
+
+# Try to force everything to stdout for correct ordering
+# Works on Mac: 2025-10-27
 echo "build.sh: START"
 
 DEV_CONDA=$( cd $RECIPE_DIR/.. ; /bin/pwd -P )