Skip to content

Commit 37c67a2

Browse files
committed
update tests, preconfigure, select a release version of Eigen
1 parent a5087a5 commit 37c67a2

4 files changed

Lines changed: 19 additions & 2 deletions

File tree

TestCases/parallel_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ def main():
12581258
# For a thin disk with the inner and outer radius of this geometry, from
12591259
# "Formulas for Stress, Strain, and Structural Matrices", 2nd Edition, figure 19-4,
12601260
# the maximum stress is 165.6MPa, we get a Von Misses stress very close to that.
1261-
rotating_cylinder_fea.test_vals = [-6.792437, -6.732377, -6.808446, 64, -8.226119, 1.6502e+08]
1261+
rotating_cylinder_fea.test_vals = [-6.886145, -6.917148, -6.959634, 23, -8.369804, 1.6502e+08]
12621262
rotating_cylinder_fea.test_vals_aarch64 = [-6.861939, -6.835539, -6.895498, 22, -8.313847, 1.6502e+08]
12631263
test_list.append(rotating_cylinder_fea)
12641264

externals/eigen

Submodule eigen updated from a73501c to d71c30c

meson_scripts/init.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def init_submodules(
5050
own_mel=True,
5151
own_fado=True,
5252
own_mlpcpp=True,
53+
own_eigen=True,
5354
):
5455
cur_dir = sys.path[0]
5556

@@ -75,6 +76,8 @@ def init_submodules(
7576
github_repo_fado = "https://github.com/pcarruscag/FADO"
7677
sha_version_mlpcpp = "e19ca0cafb28c4b7ba5b8cffef42883259b00dc0"
7778
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"
79+
sha_version_eigen = "d71c30c47858effcbd39967097a2d99ee48db464"
80+
github_repo_eigen = "https://gitlab.com/libeigen/eigen.git"
7881

7982
medi_name = "MeDiPack"
8083
codi_name = "CoDiPack"
@@ -86,6 +89,7 @@ def init_submodules(
8689
mel_name = "MEL"
8790
fado_name = "FADO"
8891
mlpcpp_name = "MLPCpp"
92+
eigen_name = "Eigen"
8993

9094
base_path = cur_dir + os.path.sep + "externals" + os.path.sep
9195
alt_name_medi = base_path + "medi"
@@ -95,6 +99,7 @@ def init_submodules(
9599
alt_name_ninja = base_path + "ninja"
96100
alt_name_mel = base_path + "mel"
97101
alt_name_fado = base_path + "FADO"
102+
alt_name_eigen = base_path + "eigen"
98103
alt_name_mpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "Mutationpp"
99104
alt_name_coolprop = cur_dir + os.path.sep + "subprojects" + os.path.sep + "CoolProp"
100105
alt_name_mlpcpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "MLPCpp"
@@ -131,6 +136,8 @@ def init_submodules(
131136
submodule_status(alt_name_fado, sha_version_fado)
132137
if own_mlpcpp:
133138
submodule_status(alt_name_mlpcpp, sha_version_mlpcpp)
139+
if own_eigen:
140+
submodule_status(alt_name_eigen, sha_version_eigen)
134141
# Otherwise download the zip file from git
135142
else:
136143
if own_codi:
@@ -171,6 +178,10 @@ def init_submodules(
171178
download_module(
172179
mlpcpp_name, alt_name_mlpcpp, github_repo_mlpcpp, sha_version_mlpcpp
173180
)
181+
if own_eigen:
182+
download_module(
183+
eigen_name, alt_name_eigen, github_repo_eigen, sha_version_eigen
184+
)
174185

175186

176187
def is_git_directory(path="."):

preconfigure.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def run(
9292
own_mel=True,
9393
own_fado=True,
9494
own_mlpcpp=True,
95+
own_eigen=True,
9596
):
9697
# Set up the build environment, i.e. clone or download submodules
9798
init_submodules(
@@ -105,6 +106,7 @@ def run(
105106
own_mel=own_mel,
106107
own_fado=own_fado,
107108
own_mlpcpp=own_mlpcpp,
109+
own_eigen=own_eigen,
108110
)
109111

110112
if own_meson:
@@ -155,6 +157,9 @@ def run(
155157
help="do not download copy of MLpCpp",
156158
action="store_false",
157159
)
160+
parser.add_argument(
161+
"--no-eigen", help="do not download copy of Eigen", action="store_false"
162+
)
158163
args = parser.parse_args()
159164

160165
run(
@@ -167,4 +172,5 @@ def run(
167172
own_mel=args.no_mel,
168173
own_fado=args.no_fado,
169174
own_mlpcpp=args.no_mlpcpp,
175+
own_eigen=args.no_eigen,
170176
)

0 commit comments

Comments
 (0)