Skip to content

Commit 8af8d8f

Browse files
martin-frbgmartin-frbg
authored
Merge branch 'develop' into jn/build-exe
2 parents 983fca5 + baa2536 commit 8af8d8f

604 files changed

Lines changed: 40151 additions & 21263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cirrus.yml‎

Lines changed: 122 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
macos_instance:
2-
image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
3-
1+
#macos_instance:
2+
# image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
3+
#
44
#task:
55
# name: AppleM1/LLVM
66
# compile_script:
@@ -9,7 +9,7 @@ macos_instance:
99
# - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
1010
# - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
1111
# - make TARGET=VORTEX USE_OPENMP=1 CC=clang
12-
12+
#
1313
#task:
1414
# name: AppleM1/LLVM/ILP64
1515
# compile_script:
@@ -18,7 +18,7 @@ macos_instance:
1818
# - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
1919
# - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
2020
# - make TARGET=VORTEX USE_OPENMP=1 CC=clang INTERFACE64=1
21-
21+
#
2222
#task:
2323
# name: AppleM1/LLVM/CMAKE
2424
# compile_script:
@@ -30,7 +30,7 @@ macos_instance:
3030
# - cd build
3131
# - cmake -DTARGET=VORTEX -DCMAKE_C_COMPILER=clang -DBUILD_SHARED_LIBS=ON ..
3232
# - make -j 4
33-
33+
#
3434
#task:
3535
# name: AppleM1/GCC/MAKE/OPENMP
3636
# compile_script:
@@ -39,122 +39,125 @@ macos_instance:
3939
# - export LDFLAGS="-L/opt/homebrew/lib"
4040
# - export CPPFLAGS="-I/opt/homebrew/include"
4141
# - make CC=gcc-11 FC=gfortran-11 USE_OPENMP=1
42-
43-
macos_instance:
44-
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
45-
task:
46-
name: AppleM1/LLVM x86_64 xbuild
47-
compile_script:
48-
- #brew install llvm
49-
- export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
50-
- export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
51-
- export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
52-
- export ARCHS="i386 x86_64"
53-
- export ARCHS_STANDARD="i386 x86_64"
54-
- export ARCHS_STANDARD_32_64_BIT="i386 x86_64"
55-
- export ARCHS_STANDARD_64_BIT=x86_64
56-
- export ARCHS_STANDARD_INCLUDING_64_BIT="i386 x86_64"
57-
- export ARCHS_UNIVERSAL_IPHONE_OS="i386 x86_64"
58-
- export VALID_ARCHS="i386 x86_64"
59-
- xcrun --sdk macosx --show-sdk-path
60-
- xcodebuild -version
61-
- export CC=/Applications/Xcode_26.0.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
62-
- export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode_26.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX26.0.sdk -arch x86_64"
63-
- make TARGET=CORE2 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
64-
always:
65-
config_artifacts:
66-
path: "*conf*"
67-
type: text/plain
42+
#
43+
#macos_instance:
44+
# image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
45+
#task:
46+
# name: AppleM1/LLVM x86_64 xbuild
47+
# compile_script:
48+
# - #brew install llvm
49+
# - export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
50+
# - export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
51+
# - export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
52+
# - export ARCHS="i386 x86_64"
53+
# - export ARCHS_STANDARD="i386 x86_64"
54+
# - export ARCHS_STANDARD_32_64_BIT="i386 x86_64"
55+
# - export ARCHS_STANDARD_64_BIT=x86_64
56+
# - export ARCHS_STANDARD_INCLUDING_64_BIT="i386 x86_64"
57+
# - export ARCHS_UNIVERSAL_IPHONE_OS="i386 x86_64"
58+
# - export VALID_ARCHS="i386 x86_64"
59+
# - xcrun --sdk macosx --show-sdk-path
60+
# - xcodebuild -version
61+
# - export CC=/Applications/Xcode_26.0.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
62+
# - export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode_26.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX26.0.sdk -arch x86_64"
63+
# - make TARGET=CORE2 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
64+
# always:
65+
# config_artifacts:
66+
# path: "*conf*"
67+
# type: text/plain
6868
# lib_artifacts:
6969
# path: "libopenblas*"
7070
# type: application/octet-streamm
71-
72-
macos_instance:
73-
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
74-
task:
75-
name: AppleM1/LLVM armv8-ios xbuild
76-
compile_script:
77-
- #brew install llvm
78-
- export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
79-
- export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
80-
- export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
81-
- export CC=/Applications/Xcode_26.0.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
82-
- export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode_26.0.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.0.sdk -arch arm64 -miphoneos-version-min=10.0"
83-
- xcrun --sdk iphoneos --show-sdk-path
84-
- ls -l /Applications
85-
- make TARGET=ARMV8 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 CROSS=1
86-
always:
87-
config_artifacts:
88-
path: "*conf*"
89-
type: text/plain
90-
91-
macos_instance:
92-
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
93-
task:
94-
name: AppleM1/LLVM armv7-androidndk xbuild
95-
compile_script:
96-
- brew install --cask android-ndk
97-
- export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk"
98-
- export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang
99-
- make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
100-
always:
101-
config_artifacts:
102-
path: "*conf*"
103-
type: text/plain
104-
105-
task:
106-
name: NeoverseN1
107-
arm_container:
108-
image: node:latest
109-
compile_script:
110-
- make
111-
112-
task:
113-
name: NeoverseN1-ILP64
114-
arm_container:
115-
image: node:latest
116-
compile_script:
117-
- make INTERFACE64=1
118-
119-
task:
120-
name: NeoverseN1-OMP
121-
arm_container:
122-
image: node:latest
123-
cpu: 8
124-
compile_script:
125-
- make USE_OPENMP=1
126-
127-
FreeBSD_task:
128-
name: FreeBSD-gcc
129-
freebsd_instance:
130-
image_family: freebsd-14-3
131-
install_script:
132-
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
133-
compile_script:
134-
- ls -l /usr/local/lib
135-
- gmake CC=gcc
136-
137-
138-
FreeBSD_task:
139-
name: freebsd-gcc-ilp64
140-
freebsd_instance:
141-
image_family: freebsd-14-3
142-
install_script:
143-
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
144-
compile_script:
145-
- ls -l /usr/local/lib
146-
- gmake CC=gcc INTERFACE64=1
147-
148-
FreeBSD_task:
149-
name: FreeBSD-clang-openmp
150-
freebsd_instance:
151-
image_family: freebsd-14-3
152-
install_script:
153-
- pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
154-
- ln -s /usr/local/lib/gcc14/libgfortran.so.5.0.0 /usr/lib/libgfortran.so
155-
compile_script:
156-
- gmake CC=clang FC=gfortran USE_OPENMP=1 CPP_THREAD_SAFETY_TEST=1
157-
71+
#
72+
#macos_instance:
73+
# image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
74+
#task:
75+
# name: AppleM1/LLVM armv8-ios xbuild
76+
# compile_script:
77+
# - #brew install llvm
78+
# - export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
79+
# - export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
80+
# - export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
81+
# - export CC=/Applications/Xcode_26.0.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
82+
# - export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode_26.0.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.0.sdk -arch arm64 -miphoneos-version-min=10.0"
83+
# - xcrun --sdk iphoneos --show-sdk-path
84+
# - ls -l /Applications
85+
# - make TARGET=ARMV8 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 CROSS=1
86+
# always:
87+
# config_artifacts:
88+
# path: "*conf*"
89+
# type: text/plain
90+
#
91+
#macos_instance:
92+
# image: ghcr.io/cirruslabs/macos-tahoe-xcode:latest
93+
#task:
94+
# name: AppleM1/LLVM armv7-androidndk xbuild
95+
# compile_script:
96+
# - brew install --cask android-ndk
97+
# - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk"
98+
# - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang
99+
# - export AR=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
100+
# - export RANLIB=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib
101+
# - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
102+
# always:
103+
# config_artifacts:
104+
# path: "*conf*"
105+
# type: text/plain
106+
#
107+
#task:
108+
# name: NeoverseN1
109+
# arm_container:
110+
# image: node:latest
111+
# compile_script:
112+
# - make
113+
#
114+
# task:
115+
# name: NeoverseN1-ILP64
116+
# arm_container:
117+
# image: node:latest
118+
# compile_script:
119+
# - make INTERFACE64=1
120+
#
121+
#task:
122+
# name: NeoverseN1-OMP
123+
# arm_container:
124+
# image: node:latest
125+
# cpu: 8
126+
# compile_script:
127+
# - make USE_OPENMP=1
128+
#
129+
#
130+
#FreeBSD_task:
131+
# name: FreeBSD-gcc
132+
# freebsd_instance:
133+
# image_family: freebsd-14-3
134+
# install_script:
135+
# - pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
136+
# compile_script:
137+
# - ls -l /usr/local/lib
138+
# - gmake CC=gcc
139+
#
140+
#
141+
#FreeBSD_task:
142+
# name: freebsd-gcc-ilp64
143+
# freebsd_instance:
144+
# image_family: freebsd-14-3
145+
# install_script:
146+
# - pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
147+
# compile_script:
148+
# - ls -l /usr/local/lib
149+
# - gmake CC=gcc INTERFACE64=1
150+
#
151+
#FreeBSD_task:
152+
# name: FreeBSD-clang-openmp
153+
# freebsd_instance:
154+
# image_family: freebsd-14-3
155+
# install_script:
156+
# - pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
157+
# - ln -s /usr/local/lib/gcc14/libgfortran.so.5.0.0 /usr/lib/libgfortran.so
158+
# compile_script:
159+
# - gmake CC=clang FC=gfortran USE_OPENMP=1 CPP_THREAD_SAFETY_TEST=1
160+
#
158161
#task:
159162
# name: Windows/LLVM16 --- too slow ---
160163
# windows_container:

0 commit comments

Comments
 (0)