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

Cbs/test pyoculus meson #444

Closed
wants to merge 5 commits into from
Closed

Cbs/test pyoculus meson #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
396ccd7
test meson branch if fixes failing CI
smiet Sep 5, 2024
a41e168
also switch to updated f90wrap.
smiet Sep 5, 2024
3b15604
emptycommit testtrigger
smiet Sep 6, 2024
51ffda9
switch simsopt to a fixed setuptools version
smiet Sep 6, 2024
7c9572a
empty testtrigger
smiet Sep 6, 2024
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
9 changes: 4 additions & 5 deletions .github/workflows/extensive_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
# We must run actions/checkout before downloading and building VMEC, since checkout deletes the contents of the directory.
- name: Download the VMEC2000 standalone repository
if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all')
run: git clone https://github.com/hiddensymmetries/VMEC2000.git
run: git clone -b fix_setuptoolsversion https://github.com/hiddensymmetries/VMEC2000.git

- name: ls -l again
run: |
Expand All @@ -98,7 +98,7 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann
pip install wheel "numpy<2.0.0" scipy f90nml h5py scikit-build cmake qsc sympy pyevtk matplotlib ninja plotly networkx pygraphviz ground bentley_ottmann f90wrap

- name: Install booz_xform
if: contains(matrix.packages, 'vmec') || contains(matrix.packages, 'all')
Expand All @@ -125,8 +125,6 @@ jobs:
pip install -e SPEC/Utilities/pythontools
python -c "import py_spec; print('success')"

- name: Install f90wrap
run: pip install -U git+https://github.com/zhucaoxiang/f90wrap

- name: Build SPEC python wrapper.
if: contains(matrix.packages, 'spec') || contains(matrix.packages, 'all')
Expand Down Expand Up @@ -166,8 +164,9 @@ jobs:
- name: Install simsopt package
if: contains(matrix.packages, 'spec') || contains(matrix.packages, 'all')
run: |
pip install -v git+https://github.com/zhisong/pyoculus@meson_build
pip install mpi4py py_spec h5py
pip install -v .
pip install mpi4py py_spec pyoculus h5py

- name: Install simsopt package
if: contains(matrix.packages, 'none')
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

# We must run actions/checkout before downloading and building VMEC, since checkout deletes the contents of the directory.
- name: Download the VMEC2000 standalone repository
run: git clone --depth=1 https://github.com/hiddensymmetries/VMEC2000.git
run: git clone --depth=1 -b fix_setuptoolsversion https://github.com/hiddensymmetries/VMEC2000.git

- name: ls -l again
run: |
Expand All @@ -93,7 +93,10 @@ jobs:
- name: Install python dependencies
run: |
sudo apt-get install graphviz graphviz-dev
pip install "numpy<2.0.0" cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec pyoculus h5py ground bentley_ottmann
pip install "numpy<2.0.0" cmake scikit-build f90nml ninja wheel setuptools sympy qsc pyevtk matplotlib plotly networkx pygraphviz mpi4py py_spec h5py ground bentley_ottmann

- name: Install pyoculus meson branch
run: pip install -v git+https://github.com/zhisong/pyoculus@meson_build

- name: Install booz_xform
run: pip install -v git+https://github.com/hiddenSymmetries/booz_xform
Expand Down Expand Up @@ -129,7 +132,7 @@ jobs:
python -c "import py_spec; print('success')"

- name: Install f90wrap
run: pip install -U git+https://github.com/zhucaoxiang/f90wrap
run: pip install f90wrap

- name: Build SPEC python wrapper.
run: |
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN git clone --depth 1 https://github.com/PrincetonUniversity/SPEC.git /src/SPE
/venv/bin/pip install -r requirements.txt && \
/venv/bin/pip install -v .

RUN git clone --depth 1 https://github.com/hiddenSymmetries/VMEC2000.git /src/VMEC && \
RUN git clone --depth 1 -b fix_setuptoolsversion https://github.com/hiddenSymmetries/VMEC2000.git /src/VMEC && \
cd /src/VMEC && \
cp cmake/machines/ubuntu.json cmake_config_file.json && \
/venv/bin/pip install -v . 2>&1 | tee vmec_build.log
Expand Down
2 changes: 1 addition & 1 deletion ci/singularity.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Stage: devel
cd ../../.. && \
rm -rf SPEC

git clone --depth 1 https://github.com/hiddenSymmetries/VMEC2000.git && \
git clone --depth 1 -b fix_setuptoolsversion https://github.com/hiddenSymmetries/VMEC2000.git && \
cd VMEC2000 && \
cp cmake/machines/ubuntu.json cmake_config_file.json && \
/venv/bin/pip install . && \
Expand Down
Loading