Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 21f77fd8 authored by hhakim's avatar hhakim
Browse files

Replace clang 8 by clang 9 on macos gitlab-runners + correct typo into build dir of ctest_matlab.

clang 8 was failing after any launch on the newly installed macos VM (faust-macos2023).
parent 9d81f9b1
No related branches found
No related tags found
No related merge requests found
......@@ -90,7 +90,7 @@ ctest_matlab:
- ctest -O ctest.log -S ./CDashConfScript.cmake -j4 --output-junit junit_output.xml
- misc/continuous_integration/jobs/junit_html_report.sh matlab_matfaust_test_output
# fail the ci job if any ctest test (or unit test) have failed
- export BUILD_DIR=$(ls -d build | tail -1)
- export BUILD_DIR=$(ls -d build_* | tail -1)
- echo "Failed tests:"
- if grep -B 1 'Outcome:.*Failed' ${BUILD_DIR}/matlab_matfaust_test_output.html | sed -ne 's%.*Test case:.*<b>\(.*\)</b>.*%\1%p'; then exit 1; else if grep "Failure Summary:" ${BUILD_DIR}/matlab_matfaust_test_output.html; then echo "all ctest passed but some unit tests failed (look the junit report!)"; exit 2; else echo "(None) all tests passed"; exit 0;fi;fi
except:
......@@ -539,7 +539,7 @@ pages:
pkg_macos_purepy_rev:
extends: .pkg_purepy_rev
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, EXPERIMENTAL_PKG: "ON", BUILD_MULTITHREAD: "ON", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-8.0"}
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, EXPERIMENTAL_PKG: "ON", BUILD_MULTITHREAD: "ON", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0"}
before_script:
- VERSION=$(echo $CI_COMMIT_SHA | sed -e 's/^\(.\{8\}\).*/\1/')
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
......@@ -585,7 +585,7 @@ pkg_linux_purepy_rev:
pkg_macos_purepy_release:
extends: .pkg_purepy_release
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-8.0", PYTHON_PATH: '/opt/local/bin/python3.9', JOB_PYTHON: 'python3.9'}
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0", PYTHON_PATH: '/opt/local/bin/python3.9', JOB_PYTHON: 'python3.9'}
before_script:
- VERSION=$CI_COMMIT_TAG
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
......@@ -596,13 +596,13 @@ pkg_macos_purepy_release:
pkg_macos_purepy_release_extra_pyver:
extends: pkg_macos_purepy_release
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", PYTHON_PATH: '/opt/local/bin/python3.11', JOB_PYTHON: 'python3.11', CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-8.0"}
variables: {MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, BUILD_MULTITHREAD: "ON", FAUST_TORCH: "OFF", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", PYTHON_PATH: '/opt/local/bin/python3.11', JOB_PYTHON: 'python3.11', CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0"}
tags:
- macos
pkg_macos_purepy_release_torch_linked:
extends: pkg_macos_purepy_release
variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, FAUST_TORCH: "ON", CMAKE_PREFIX_PATH: "/opt/local/libtorch/share/cmake/Torch", BUILD_MULTITHREAD: "ON", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-8.0"}
variables: {GIT_SUBMODULE_STRATEGY: recursive, MATIO_STATIC_LIB_PATH: $MACOS_MATIO_SLIB_PATH, Z_STATIC_LIB_PATH: $MACOS_ZLIB_SLIB_PATH, HDF5_STATIC_LIB_PATH: $MACOS_HDF5_SLIB_PATH, FAUST_TORCH: "ON", CMAKE_PREFIX_PATH: "/opt/local/libtorch/share/cmake/Torch", BUILD_MULTITHREAD: "ON", EXPERIMENTAL_PKG: "OFF", NOPY2: "ON", CMAKE_CXX_COMPILER: "/opt/local/bin/clang++-mp-9.0"}
before_script:
- VERSION=$CI_COMMIT_TAG
- if [[ ! -d 'build' ]]; then mkdir build;fi; cd build
......
......@@ -28,17 +28,28 @@ yes | port install eigen3 matio cmake p7zip zlib
sudo ln -sf /opt/local/lib/libmatio.a /usr/local/lib/
sudo ln -sf /opt/local/include/matio.h /usr/local/include
sudo ln -sf /opt/local/include/matio_pub.h /usr/local/include
for F in /opt/local/lib/libmatio.*; do sudo ln -sf $F /usr/local/lib/$(basename $F);done
for F in /opt/local/lib/libhdf5*; do sudo ln -sf $F /usr/local/lib/$(basename $F);done
for F in /opt/local/lib/libz*; do sudo ln -sf $F /usr/local/lib/$(basename $F);done
yes | port install libomp-devel libomp
### 4. Install and configure clang compiler environment (and OpenMP)
port -f activate libomp
sudo cp /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libomp_macports.dylib # needed for ci package jobs
yes | port install clang-8.0
yes | port install clang-9.0
echo 'export OpenMP_INC_DIR=/opt/local/include/libomp' >> /Users/ci/.bash_profile
echo 'export OpenMP_gomp_LIBRARY=/opt/local/lib/libomp/libgomp.dylib' >> /Users/ci/.bash_profile
mv /usr/bin/clang /usr/bin/clang_
mv /usr/bin/clang++ /usr/bin/clang++_
ln -sf /opt/local/bin/clang-mp-8.0 /opt/local/bin/clang
ln -sf /opt/local/bin/clang++-mp-8.0 /opt/local/bin/clang++
ln -sf /opt/local/bin/clang-mp-9.0 /opt/local/bin/clang
ln -sf /opt/local/bin/clang++-mp-9.0 /opt/local/bin/clang++
ln -sf /opt/local/bin/clang-mp-9.0 /usr/bin/clang
ln -sf /opt/local/bin/clang++-mp-9.0 /usr/bin/clang++
# we switched from clang 8 to clang 9 because of this error:
# ciosx:~ ci$ /opt/local/libexec/llvm-8.0/bin/clang --version
# dyld: cannot load 'clang' (load command 0x80000034 is unknown)
# Trace/BPT trap: 5
#mv /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++_ # don't do this or port won't be able to detect clang version and make any install
#udo ln -sf /opt/local/bin/clang++-mp-9.0 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
### 5. Install Python packages and dependencies
yes | port install graphviz doxygen
sudo ln -sf /opt/local/bin/dot /usr/bin/
......@@ -49,7 +60,7 @@ port select --set pip pip39
ln -sf /opt/local/bin/python3.9 /opt/local/bin/python3
yes | port install py39-cython
yes | port select --set cython cython39
yes |pip install doxypypy chardet wheel pygsp numpy
yes | python3.9 -m pip install doxypypy chardet wheel pygsp numpy setuptools==49.1.3 # above this version commit sha256 as version fails
# get dest dir before downloading because otherwise it would be the current path
DOXYPYPY_DIR=$(dirname $(python3 -c "import doxypypy; print(doxypypy.__file__)"))
wget https://raw.githubusercontent.com/Feneric/doxypypy/master/doxypypy/doxypypy.py
......@@ -63,6 +74,8 @@ mv libtorch /opt/local/
# install a recent version of cmake (>=3.21)
sudo port install cmake
sudo port activate cmake
sudo mv /usr/local/bin/cmake /usr/local/bin/cmake_
sudo mv /usr/local/bin/ctest /usr/local/bin/ctest_
# disable pre-installed old one (3.2)
sudo mv /usr/local/bin/cmake /usr/local/bin/cmake_old
echo "Please manually install matlab by copying directly the directory from /Volumes/Untitled/ attached to faust2-macos-2019"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment