Skip to content

Commit 758dc40

Browse files
maxfirmbachmaxfirmbach
authored
Merge pull request #1590 from 4C-multiphysics/docker-update-remove-Isorropia-from-Trilinos-install
Remove everything `Isorropia`
2 parents 088a417 + 6ca4e36 commit 758dc40

File tree

10 files changed

+27
-34
lines changed

10 files changed

+27
-34
lines changed

‎.github/workflows/buildtest.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
gcc13_assertions_build:
1717
runs-on: ubuntu-latest
1818
container:
19-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
19+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
2020
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2121
defaults:
2222
run:
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
if: github.ref != 'refs/heads/main'
5454
container:
55-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
55+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
5656
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5757
strategy:
5858
fail-fast: false
@@ -104,7 +104,7 @@ jobs:
104104
clang18_build:
105105
runs-on: ubuntu-latest
106106
container:
107-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
107+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
108108
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
109109
defaults:
110110
run:
@@ -158,7 +158,7 @@ jobs:
158158
needs: clang18_build
159159
runs-on: ubuntu-latest
160160
container:
161-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
161+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
162162
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
163163
defaults:
164164
run:
@@ -184,7 +184,7 @@ jobs:
184184
needs: clang18_build
185185
runs-on: ubuntu-latest
186186
container:
187-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
187+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
188188
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
189189
defaults:
190190
run:
@@ -243,7 +243,7 @@ jobs:
243243
gcc13_no_optional_dependencies_build:
244244
runs-on: ubuntu-latest
245245
container:
246-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
246+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
247247
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
248248
defaults:
249249
run:
@@ -269,7 +269,7 @@ jobs:
269269
needs: gcc13_no_optional_dependencies_build
270270
runs-on: ubuntu-latest
271271
container:
272-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
272+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
273273
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
274274
defaults:
275275
run:

‎.github/workflows/checkcode.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
clang-tidy:
3030
runs-on: ubuntu-latest
3131
container:
32-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
32+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
3333
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3434
defaults:
3535
run:
@@ -55,7 +55,7 @@ jobs:
5555
verify-headers:
5656
runs-on: ubuntu-latest
5757
container:
58-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
58+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
5959
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
6060
defaults:
6161
run:

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
clang18_coverage_build:
99
runs-on: ubuntu-latest
1010
container:
11-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -45,7 +45,7 @@ jobs:
4545
needs: clang18_coverage_build
4646
runs-on: ubuntu-latest
4747
container:
48-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
48+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
4949
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5050
strategy:
5151
matrix:
@@ -111,7 +111,7 @@ jobs:
111111
needs: [clang18_coverage_test, clang18_coverage_build]
112112
runs-on: ubuntu-latest
113113
container:
114-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
114+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
115115
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
116116
steps:
117117
- uses: actions/checkout@v6

‎.github/workflows/documentation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
doxygen:
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
21+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
2222
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2323
defaults:
2424
run:
@@ -44,7 +44,7 @@ jobs:
4444
documentation:
4545
runs-on: ubuntu-latest
4646
container:
47-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
47+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
4848
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4949
defaults:
5050
run:

‎.github/workflows/nightly_tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
gcc13_assertions_build:
99
runs-on: ubuntu-latest
1010
container:
11-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -43,7 +43,7 @@ jobs:
4343
needs: gcc13_assertions_build
4444
runs-on: ubuntu-latest
4545
container:
46-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
46+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
4747
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4848
strategy:
4949
fail-fast: false
@@ -95,7 +95,7 @@ jobs:
9595
clang18_build:
9696
runs-on: ubuntu-latest
9797
container:
98-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
98+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
9999
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
100100
defaults:
101101
run:
@@ -193,7 +193,7 @@ jobs:
193193
needs: clang18_build
194194
runs-on: ubuntu-latest
195195
container:
196-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
196+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
197197
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
198198
strategy:
199199
fail-fast: false
@@ -245,7 +245,7 @@ jobs:
245245
clang18_build_oldest_supported_dependencies:
246246
runs-on: ubuntu-latest
247247
container:
248-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:520a7b16
248+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4d0c2ab2
249249
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
250250
defaults:
251251
run:
@@ -280,7 +280,7 @@ jobs:
280280
needs: clang18_build_oldest_supported_dependencies
281281
runs-on: ubuntu-latest
282282
container:
283-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:520a7b16
283+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4d0c2ab2
284284
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
285285
strategy:
286286
fail-fast: false
@@ -319,7 +319,7 @@ jobs:
319319
gcc13_no_optional_dependencies_build:
320320
runs-on: ubuntu-latest
321321
container:
322-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
322+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
323323
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
324324
defaults:
325325
run:
@@ -354,7 +354,7 @@ jobs:
354354
needs: gcc13_no_optional_dependencies_build
355355
runs-on: ubuntu-latest
356356
container:
357-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
357+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
358358
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
359359
strategy:
360360
fail-fast: false
@@ -406,7 +406,7 @@ jobs:
406406
gcc13_asan_build:
407407
runs-on: ubuntu-latest
408408
container:
409-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
409+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
410410
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
411411
defaults:
412412
run:
@@ -441,7 +441,7 @@ jobs:
441441
needs: gcc13_asan_build
442442
runs-on: ubuntu-latest
443443
container:
444-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
444+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
445445
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
446446
strategy:
447447
fail-fast: false

‎dependencies/current/trilinos/install.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ $CMAKE_COMMAND \
6464
-D Trilinos_ENABLE_Ifpack:BOOL=ON \
6565
-D Ifpack_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6666
-D Trilinos_ENABLE_Ifpack2:BOOL=ON \
67-
-D Trilinos_ENABLE_Isorropia:BOOL=ON \
68-
-D Isorropia_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6967
-D Trilinos_ENABLE_Kokkos:BOOL=ON \
7068
-D Trilinos_ENABLE_ML:BOOL=ON \
7169
-D ML_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \

‎dependencies/oldest_supported/trilinos/install.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ $CMAKE_COMMAND \
6464
-D Trilinos_ENABLE_Ifpack:BOOL=ON \
6565
-D Ifpack_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6666
-D Trilinos_ENABLE_Ifpack2:BOOL=ON \
67-
-D Trilinos_ENABLE_Isorropia:BOOL=ON \
68-
-D Isorropia_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6967
-D Trilinos_ENABLE_Kokkos:BOOL=ON \
7068
-D Trilinos_ENABLE_ML:BOOL=ON \
7169
-D ML_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \

‎dependencies/trilinos_develop/trilinos/install.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ $CMAKE_COMMAND \
6464
-D Trilinos_ENABLE_Ifpack:BOOL=ON \
6565
-D Ifpack_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6666
-D Trilinos_ENABLE_Ifpack2:BOOL=ON \
67-
-D Trilinos_ENABLE_Isorropia:BOOL=ON \
68-
-D Isorropia_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
6967
-D Trilinos_ENABLE_Kokkos:BOOL=ON \
7068
-D Trilinos_ENABLE_ML:BOOL=ON \
7169
-D ML_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \

‎src/core/rebalance/src/4C_rebalance_graph_based.hpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ namespace Core::Rebalance
6565
The partitioning will be done based on the method given in the parameter list. This method
6666
only makes sense with graph or hypergraph partitioning.
6767
68-
@note Use Isorropia package to access Zoltan. By default, Isorropia will use Zoltan hypergraph
69-
partitioning, treating the graph columns as hyper-edges and the graph rows as vertices. The
70-
rebalanced graph will be fill_complete().
68+
@note The default is hypergraph partitioning, treating the graph columns as hyper-edges and
69+
the graph rows as vertices. The rebalanced graph will be fill_complete().
7170
7271
\pre The initialGraph has to be filled()==true.
7372

‎tests/input_files/beam3eb_static_beam_to_solid_volume_meshtying_cube_block_iterative_preconditioner.4C.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ STRUCT NOX/Printing:
1818
SOLVER 1:
1919
SOLVER: "Belos"
2020
AZPREC: "Teko"
21-
AZTOL: 1e-06
21+
AZTOL: 1e-08
2222
AZOUTPUT: 5
2323
AZREUSE: 0
2424
TEKO_XML_FILE: "xml/block_preconditioner/beam_solid_iterative.xml"

0 commit comments

Comments
 (0)