Skip to content

Commit 6a6766d

Browse files
author
Francesco Rizzi
authored
Merge pull request #53 from Pressio/simplify_things
Simplify things
2 parents 2972c27 + c277d4d commit 6a6766d

File tree

2,208 files changed

+39
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,208 files changed

+39
-137
lines changed

.github/workflows/test-all.yml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
env: # environment variables available to all steps
3737
CXX: ${{ matrix.config.cxx }}
38-
APT_PACKAGES: python3 pip python-is-python3 g++ clang gpg wget
38+
APT_PACKAGES: python3 pip python-is-python3 g++ clang gpg wget cmake
3939
PIP_PACKAGES: pytest build numpy scipy matplotlib PyYAML GitPython
4040
SRC_HOME: /home/runner/work/pressio-tutorials/pressio-tutorials
4141
BUILD_DIR: /home/runner/work/build/pressio-tutorials
@@ -46,19 +46,7 @@ jobs:
4646
- name: Install packages
4747
run: |
4848
sudo apt-get update
49-
sudo apt-get install -y --install-suggests $APT_PACKAGES
50-
51-
- name: Install CMake
52-
run: |
53-
export CMAKE_KEYRING=/usr/share/keyrings/kitware-archive-keyring.gpg
54-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
55-
| gpg --dearmor - \
56-
| sudo tee $CMAKE_KEYRING >/dev/null
57-
echo "deb [signed-by=$CMAKE_KEYRING] https://apt.kitware.com/ubuntu/ focal main" \
58-
| sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
59-
sudo apt-get update
60-
rm $CMAKE_KEYRING
61-
sudo apt-get install -y kitware-archive-keyring cmake
49+
sudo apt-get install -y $APT_PACKAGES
6250
6351
- name: Check environment
6452
run: |
@@ -90,20 +78,14 @@ jobs:
9078
cmake \
9179
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
9280
-DCMAKE_BUILD_TYPE:STRING=${{ matrix.config.mode }} \
93-
-DPRESSIOTUTORIALS_ENABLE_TESTS=ON \
9481
-B $BUILD_DIR -S $SRC_HOME
9582
9683
- name: Build tests
9784
run: |
9885
export NUM_CPU=$(grep -c processor /proc/cpuinfo)
9986
cmake --build $BUILD_DIR -j $NUM_CPU
10087
101-
- name: Run tests
102-
run: |
103-
cd $BUILD_DIR
104-
ctest
105-
106-
- name: Run demos
88+
- name: Run tutorials
10789
run: |
10890
cd $BUILD_DIR/ode-using-eigen-types
10991
bash runall_for_ci.sh

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ set(CMAKE_CXX_EXTENSIONS OFF)
5353
enable_testing()
5454
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nonlinearsolvers-using-eigen-types)
5555
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ode-using-eigen-types)
56-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/end-to-end-roms)

end-to-end-roms/2d_swe_customizations/__init__.py renamed to deprecated_to_revise/end-to-end-roms/2d_swe_customizations/__init__.py

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/CMakeLists.txt renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/CMakeLists.txt

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/FOM.png renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/FOM.png

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/ROM_22.png renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/ROM_22.png

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/ROM_55.png renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/ROM_55.png

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/clean.py renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/clean.py

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/plot.py renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/plot.py

File renamed without changes.

end-to-end-roms/2d_swe_galerkin_default/wf.yaml renamed to deprecated_to_revise/end-to-end-roms/2d_swe_galerkin_default/wf.yaml

File renamed without changes.

0 commit comments

Comments
 (0)