Skip to content

Commit e757912

Browse files
committed
Remove openmp completely
1 parent 8afec91 commit e757912

7 files changed

Lines changed: 17 additions & 18 deletions

File tree

.github/workflows/python-wheels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
- os: macos-15-intel
3535
arch: x86_64
3636
py-vers: cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*
37-
before-all: brew install libomp pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
38-
extra-env: CC=clang CXX=clang++ CMAKE_PREFIX_PATH="$(brew --prefix libomp)"
37+
before-all: brew install pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
38+
extra-env: CC=clang CXX=clang++
3939
mdt: 11
4040
- os: macos-15
4141
arch: arm64
4242
py-vers: cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*
43-
before-all: brew install libomp pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
44-
extra-env: CC=clang CXX=clang++ CMAKE_PREFIX_PATH="$(brew --prefix libomp)"
43+
before-all: brew install pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
44+
extra-env: CC=clang CXX=clang++
4545
mdt: 11
4646

4747
env:

.github/workflows/sanitisers.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ jobs:
2424
submodules: true
2525
fetch-depth: 0
2626

27-
- name: install tools
28-
run: |
29-
sudo apt -y install libomp-dev
30-
3127
- name: make build directory
3228
run: mkdir build_dir
3329

.github/workflows/static-analysis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
- name: make build directory
2828
run: mkdir build_dir
2929

30-
- name: install tools
31-
run: |
32-
sudo apt -y install libomp-dev
33-
3430
- name: install analysers
3531
run: |
3632
sudo apt -y install cppcheck

.github/workflows/unit-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: install system packages
29-
run: brew install libomp pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
29+
run: brew install pkg-config automake autoconf autoconf-archive libtool ninja openssl zlib bzip2 xz
3030

3131
- name: make build directory
3232
run: mkdir build_dir
3333

3434
- name: cmake configure
35-
run: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_PREFIX_PATH=$(brew --prefix libomp)
35+
run: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_CXX_COMPILER=clang++
3636
working-directory: build_dir
3737

3838
- name: cmake build

PyPI_README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@
1212

1313
Tool to compute decoding quantities.
1414

15+
This is a Python-wrapped C++ project with prebuilt CPython wheels targeting manylinux_2_28 on Linux and macOS 11.0+.
16+
17+
| Platform \ CPython | ≤3.8 | 3.9 | 3.10 | 3.11 | 3.12 | 3.13 | 3.14 |
18+
|-----------------------------| ---- | --- | ---- | ---- | ---- | ---- | ---- |
19+
| Linux x86_64 ||||||||
20+
| Linux aarch64 ||||||||
21+
| macOS Intel (x86_64) ||||||||
22+
| macOS Apple Silicon (arm64) ||||||||
23+
24+
1525
## Quickstart
1626

1727
### Install the Python module from PyPI

cmake/AsmcPrepareDecodingConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ find_dependency(cereal)
44
find_dependency(Eigen3)
55
find_dependency(fmt)
66
find_dependency(GMP)
7-
find_dependency(OpenMP)
87
find_dependency(ZLIB)
98

109
include(${CMAKE_CURRENT_LIST_DIR}/AsmcPrepareDecoding_Runtime.cmake)

src/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ if (BUILD_WITH_SMCPP_SUPPORT)
9999
find_package(cereal CONFIG REQUIRED)
100100
message(STATUS "Found cereal ${cereal_VERSION}")
101101

102-
find_package(OpenMP REQUIRED)
103-
104102
add_library(smcpp_lib 3rd_party/smcpp.cpp 3rd_party/smcpp.hpp 3rd_party/mpreal.h)
105103

106104
target_include_directories(
@@ -109,7 +107,7 @@ if (BUILD_WITH_SMCPP_SUPPORT)
109107
$<INSTALL_INTERFACE:3rd_party>
110108
)
111109

112-
target_link_libraries(smcpp_lib PRIVATE Eigen3::Eigen fmt::fmt PkgConfig::gmpxx PkgConfig::mpfr cereal::cereal OpenMP::OpenMP_CXX)
110+
target_link_libraries(smcpp_lib PRIVATE Eigen3::Eigen fmt::fmt PkgConfig::gmpxx PkgConfig::mpfr cereal::cereal)
113111
set_target_properties(smcpp_lib PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
114112
set_target_properties(smcpp_lib PROPERTIES CXX_CLANG_TIDY "")
115113
set_target_properties(smcpp_lib PROPERTIES CXX_CPPCHECK "")

0 commit comments

Comments
 (0)