Skip to content

Commit

Permalink
Move fast Mac builds to macOS 15, Sequoia
Browse files Browse the repository at this point in the history
  • Loading branch information
benmwebb committed Sep 17, 2024
1 parent 3b285df commit 4476dd6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ do_build() {
mkdir ../build && cd ../build && run_cmake_build ../imp-${IMPVERSION} $PLATFORM python3 "$CMAKE" "$CTEST" "make -k" ""

# Test IMP fast build (with benchmarks)
elif [ $PLATFORM = "fast8" ] || [ $PLATFORM = "fastmac14" ]; then
elif [ $PLATFORM = "fast8" ] || [ $PLATFORM = "fastmac15" ]; then
get_cmake $PLATFORM
PYTHON="python3"
if [ $PLATFORM != "fastmac14" ]; then
if [ $PLATFORM != "fastmac15" ]; then
use_modeller_svn
fi
if [ $PLATFORM = "fast8" ]; then
Expand All @@ -149,7 +149,7 @@ do_build() {
# Load extra modules for tests
module load python3/scipy python3/scikit python3/matplotlib python3/pandas python3/pyrmsd gnuplot python3/biopython python3/networkx
fi
if [ $PLATFORM = "fastmac14" ]; then
if [ $PLATFORM = "fastmac15" ]; then
# domino3 uses SSE3, so won't work on ARM; autodiff only currently
# tested on Fedora
CMAKE_LAB_ONLY_ARGS+=("-DIMP_DISABLED_MODULES=domino3:liegroup:autodiff")
Expand Down
2 changes: 1 addition & 1 deletion check_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ def main():
release8 = 'release8'
# Check fast Linux and Mac builds
fast8 = 'fast8'
fastmac = 'fastmac14'
fastmac = 'fastmac15'
for f in (fastmac, fast8, release8, debug8):
c.add_cmake_log(f, ['build', 'benchmark', 'test', 'example'], [])

Expand Down
8 changes: 8 additions & 0 deletions imp_build_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,14 @@ def __init__(self, very_short, short, long, very_long, logfile):
mac_header % ("Apple Silicon MacOS 14 (Sonoma) Mac",
"Homebrew Python 3", "")
+ fast_build_vlong, 'bin-fast.mac14-intel.log')),
('fastmac15',
Platform(
'McFst', 'Mac Fast',
'Fast build (Apple Silicon Mac; MacOS 15 (Sequoia); '
'clang++; Boost 1.86; Python 3)',
mac_header % ("Apple Silicon MacOS 15 (Sequoia) Mac",
"Homebrew Python 3", "")
+ fast_build_vlong, 'bin-fast.mac15-intel.log')),
('i386-w32',
Platform(
'Win32', 'Win32',
Expand Down

0 comments on commit 4476dd6

Please sign in to comment.