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

Cmake update #156

Merged
merged 22 commits into from
Oct 26, 2023
+592 −624
Merged

Cmake update #156

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
58aec46
update CMake Files
sameeul Oct 18, 2023
162e783
update workflow and cmake
sameeul Oct 18, 2023
52b53a3
update cmake
sameeul Oct 18, 2023
c30c7f3
update cmake
sameeul Oct 18, 2023
750f311
update cmake
sameeul Oct 18, 2023
9909a75
update cmake
sameeul Oct 18, 2023
b7ce40d
update workflow
sameeul Oct 18, 2023
34f9112
try verbose pip
sameeul Oct 18, 2023
eb55f3d
update docs build
sameeul Oct 18, 2023
2ee7d5e
update some docstring and prereq install script
sameeul Oct 19, 2023
9eb6918
fix syntax
sameeul Oct 19, 2023
24b5539
update win prereq
sameeul Oct 20, 2023
8594337
add build verbosity
sameeul Oct 20, 2023
debb633
update win prereq script
sameeul Oct 23, 2023
3fd49f3
update win prereq script
sameeul Oct 23, 2023
182d6c6
update prereq scripts
sameeul Oct 23, 2023
1204129
fix linux script
sameeul Oct 23, 2023
5a70f1c
updated docs
sameeul Oct 24, 2023
2d0dfae
revert last cmake changes
sameeul Oct 24, 2023
7d541c8
Update docs and CMake
sameeul Oct 24, 2023
fe4a3fb
update based on PR review
sameeul Oct 26, 2023
4417970
build wheel with all
sameeul Oct 26, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
mamba install compilers --file ${{github.workspace}}/ci-utils/envs/conda_cpp.txt

- name: Configure CMake
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DUSEARROW=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DBUILD_WITH_ALL=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX

- name: Build
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}} --parallel 2
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

- name: Install Nyxus
working-directory: ${{github.workspace}}
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DUSEARROW=ON" python -m pip install . -vv
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_WITH_ALL=ON" python -m pip install . -vv

- name: Run PyTest
working-directory: ${{github.workspace}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test_ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
mamba install compilers=1.1.1 --file ${{github.workspace}}/ci-utils/envs/conda_cpp.txt

- name: Configure CMake
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DUSEARROW=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DBUILD_WITH_ALL=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX

- name: Build
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}} --parallel 2
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:

- name: Install Nyxus
working-directory: ${{github.workspace}}
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DUSEARROW=ON" python -m pip install . -vv
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_WITH_ALL=ON" python -m pip install . -vv

- name: Run PyTest
working-directory: ${{github.workspace}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
mamba install --file ${{github.workspace}}/ci-utils/envs/conda_cpp.txt

- name: Configure CMake
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DUSEARROW=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
run: cmake -B ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_CLI=ON -DRUN_GTEST=ON -DBUILD_WITH_ALL=ON -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX

- name: Build
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}} --parallel 2
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

- name: Install Nyxus
working-directory: ${{github.workspace}}
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DUSEARROW=ON" python -m pip install . -vv
run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_WITH_ALL=ON" python -m pip install . -vv

- name: Run PyTest
working-directory: ${{github.workspace}}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_SKIP: "*musllinux*"
CIBW_BUILD_VERBOSITY: 3
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_BEFORE_ALL_MACOS: brew install llvm libomp &&
bash ci-utils/install_prereq_linux.sh &&
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version: 2

build:
os: "ubuntu-20.04"
os: ubuntu-22.04
tools:
python: "mambaforge-4.10"

Expand Down
Loading