Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable OpenMP for MacOS Builds #455

Merged
merged 12 commits into from
Nov 16, 2021
Merged

Enable OpenMP for MacOS Builds #455

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1509b4b
Enabled OpenMP for MacOS
bertrandboudaud Nov 10, 2021
2deaefb
Added test
bertrandboudaud Nov 10, 2021
2ff436f
Fixed yaml
bertrandboudaud Nov 10, 2021
74ebcdc
Increased to 20 threads
bertrandboudaud Nov 11, 2021
6a82bc9
disabling openmp
bertrandboudaud Nov 11, 2021
fbdfcab
Enable OpenMP forOopenMS build
Nov 12, 2021
247ddf5
run examples for mac os
Nov 15, 2021
8157323
fixed path to run examples on MacOS
Nov 15, 2021
fbcead5
disabled openmp
Nov 15, 2021
6bab478
Enabled OpenMP, CI launches examples on MacOS builds
bertrandboudaud Nov 15, 2021
a689d47
Removed patch for OpenMP
bertrandboudaud Nov 15, 2021
082dd18
Fixed pip install command
bertrandboudaud Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ jobs:
brew remove yarn node
brew install cmake qt5 sdl2
brew install cppcheck gnuplot
brew install libomp
pip3 install -r tools/smartpeak/requirements.txt
- run:
name: "Pull latest (only release)"
Expand All @@ -125,7 +126,6 @@ jobs:
cd ~ &&
git clone --branch develop --depth 1 https://github.com/OpenMS/OpenMS.git &&
cd OpenMS
sed -i '' 's/#pragma omp parallel for//g' src/openms/source/FORMAT/HANDLERS/MzMLHandler.cpp
mkdir contrib_build && cd contrib_build
curl -C - -O https://abibuilder.informatik.uni-tuebingen.de/archive/openms/contrib/macOS/10.15.4/x64/appleclang-11.0.0/contrib_build.tar.gz
tar -xzf contrib_build.tar.gz
Expand Down Expand Up @@ -154,6 +154,10 @@ jobs:
cd ~/SmartPeak
export PYTHONPATH="${PWD}/tools"
python3 -m unittest discover -s ./tools/smartpeak
- run:
name: Running SmartPeak Examples
command: |
~/SmartPeak/.circleci/run_examples.sh ~/SmartPeak/smartpeak_release_build/bin
- run:
name: Packing SmartPeak
command: |
Expand Down