Skip to content

Commit 9062a9a

Browse files
agarnyagarny
authored
Upgraded third-party dependencies.
2 parents a8b57f1 + acc3c65 commit 9062a9a

File tree

11 files changed

+79
-61
lines changed

11 files changed

+79
-61
lines changed

‎src/3rdparty/LLVMClang/CMakeLists.txt‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
set(PACKAGE_NAME LLVMClang)
16-
set(PACKAGE_VERSION 14.0.6)
16+
set(PACKAGE_VERSION 16.0.6)
1717
set(PACKAGE_REPOSITORY llvm-project)
18-
set(RELEASE_TAG llvmorg-14.0.6-libopencor)
18+
set(RELEASE_TAG llvmorg-16.0.6-libopencor)
1919
set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
2020

2121
# Either retrieve or build our package.
@@ -26,42 +26,42 @@ if(LIBOPENCOR_PREBUILT_LLVMCLANG)
2626
if(INTEL_MODE)
2727
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
2828
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
29-
5bd0c82b3015a170ac2e53942872fc9bb1e4e250)
29+
1182a7df3c015a06e19e75bb6f8972ceefaa2cba)
3030
else()
3131
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3232
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
33-
8979f92eb44c9612082efc619c58609f391a06e6)
33+
bd28dbf00f1c200936012815dfc990bd3b5e11bd)
3434
endif()
3535
else()
3636
if(INTEL_MODE)
3737
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3838
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
39-
c9dddc138d6dc9ea90554152f5274fb4820a52c5)
39+
b56abbc32573a46207de270819f146b798187c14)
4040
else()
4141
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4242
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
43-
5ff417c2906c15dee2155116fb8882df5ec0b762)
43+
71004b425b4efc2b62f0e77e48a8a3c594fad95f)
4444
endif()
4545
endif()
4646
elseif(APPLE)
4747
if(INTEL_MODE)
4848
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4949
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
50-
d0738ed7481fcae143c1f8b52a1ea82ad765d09e)
50+
6ff1215e6506f369ba080d441d659c1732ac1c6e)
5151
else()
5252
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5353
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
54-
868de8ec69bb19f2bc229a8a256d5ba3bdd59f54)
54+
50bee9afce1e06430ec0227ca89980115e8f7467)
5555
endif()
5656
else()
5757
if(INTEL_MODE)
5858
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5959
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
60-
965d782bcc86872230315c0915fadb0219cfe9b5)
60+
cea9d122196d5a69067086dd46393db2f9c1d341)
6161
else()
6262
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6363
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
64-
582fc94cd57deed6674454eb94a24e759797b5bc)
64+
3ec70c1cd21f15b461eefa769079254669d797d3)
6565
endif()
6666
endif()
6767
else()
@@ -106,6 +106,7 @@ else()
106106
CMAKE_ARGS
107107
-DCLANG_BUILD_TOOLS=OFF
108108
-DCLANG_ENABLE_ARCMT=OFF
109+
-DCLANG_ENABLE_LIBXML2=OFF
109110
-DCLANG_ENABLE_STATIC_ANALYZER=OFF
110111
-DCLANG_PLUGIN_SUPPORT=OFF
111112
${CLANG_TABLEGEN}
@@ -139,6 +140,7 @@ else()
139140
-DLLVM_ENABLE_UNWIND_TABLES=OFF
140141
-DLLVM_ENABLE_WARNINGS=OFF
141142
-DLLVM_ENABLE_ZLIB=OFF
143+
-DLLVM_ENABLE_ZSTD=OFF
142144
-DLLVM_HOST_TRIPLE=${LLVM_HOST_TRIPLE}
143145
-DLLVM_INCLUDE_BENCHMARKS=OFF
144146
-DLLVM_INCLUDE_DOCS=OFF
@@ -189,8 +191,10 @@ set(LLVMCLANG_CMAKE_PACKAGE_NAME Clang CACHE INTERNAL "${PACKAGE_NAME}'s CMake p
189191
set(LLVMCLANG_CMAKE_PACKAGE_NAMES LLVM Clang CACHE INTERNAL "${PACKAGE_NAME}'s CMake package names.")
190192
set(LLVMCLANG_INCLUDE_DIR ${INSTALL_DIR}/include CACHE INTERNAL "${PACKAGE_NAME}'s include directory.")
191193
set(LLVMCLANG_LIBRARIES
194+
# clang
192195
clangAnalysis
193196
clangAnalysisFlowSensitive
197+
clangAnalysisFlowSensitiveModels
194198
clangAPINotes
195199
clangAST
196200
clangASTMatchers
@@ -202,6 +206,7 @@ set(LLVMCLANG_LIBRARIES
202206
clangDriver
203207
clangDynamicASTMatchers
204208
clangEdit
209+
clangExtractAPI
205210
clangFormat
206211
clangFrontend
207212
clangFrontendTool
@@ -217,11 +222,12 @@ set(LLVMCLANG_LIBRARIES
217222
clangStaticAnalyzerCheckers
218223
clangStaticAnalyzerCore
219224
clangStaticAnalyzerFrontend
220-
clangTesting
225+
clangSupport
221226
clangTooling
222227
clangToolingASTDiff
223228
clangToolingCore
224229
clangToolingInclusions
230+
clangToolingInclusionsStdlib
225231
clangToolingRefactoring
226232
clangToolingSyntax
227233
clangTransformer
@@ -243,26 +249,31 @@ set(LLVMCLANG_LIBRARIES
243249
LLVMDebuginfod
244250
LLVMDebugInfoDWARF
245251
LLVMDebugInfoGSYM
252+
LLVMDebugInfoLogicalView
246253
LLVMDebugInfoMSF
247254
LLVMDebugInfoPDB
248255
LLVMDemangle
249256
LLVMDiff
250257
LLVMDlltoolDriver
251258
LLVMDWARFLinker
259+
LLVMDWARFLinkerParallel
252260
LLVMDWP
253261
LLVMExecutionEngine
254262
LLVMExegesis
255263
LLVMExtensions
256264
LLVMFileCheck
265+
LLVMFrontendHLSL
257266
LLVMFrontendOpenACC
258267
LLVMFrontendOpenMP
268+
LLVMFuzzerCLI
259269
LLVMFuzzMutate
260270
LLVMGlobalISel
261271
LLVMInstCombine
262272
LLVMInstrumentation
263273
LLVMInterfaceStub
264274
LLVMInterpreter
265275
LLVMipo
276+
LLVMIRPrinter
266277
LLVMIRReader
267278
LLVMJITLink
268279
LLVMLibDriver
@@ -276,6 +287,7 @@ set(LLVMCLANG_LIBRARIES
276287
LLVMMCParser
277288
LLVMMIRParser
278289
LLVMObjCARCOpts
290+
LLVMObjCopy
279291
LLVMObject
280292
LLVMObjectYAML
281293
LLVMOption
@@ -293,9 +305,11 @@ set(LLVMCLANG_LIBRARIES
293305
LLVMTableGen
294306
LLVMTableGenGlobalISel
295307
LLVMTarget
308+
LLVMTargetParser
296309
LLVMTextAPI
297310
LLVMTransformUtils
298311
LLVMVectorize
312+
LLVMWindowsDriver
299313
LLVMWindowsManifest
300314
LLVMXRay
301315
${EXTRA_LLVMCLANG_LIBRARIES}

‎src/3rdparty/LLVMClang/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Our copy of LLVM+Clang 14.0.6 requires the changes mentioned at https://github.com/opencor/llvm-project/compare/llvmorg-14.0.6...opencor:llvm-project:llvmorg-14.0.6-libopencor to build and work correctly with libOpenCOR.
1+
Our copy of LLVM+Clang 16.0.6 requires the changes mentioned at https://github.com/opencor/llvm-project/compare/llvmorg-16.0.6...opencor:llvm-project:llvmorg-16.0.6-libopencor to build and work correctly with libOpenCOR.

‎src/3rdparty/LLVMClang/scripts/buildllvmclangtblgen‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/3rdparty/SUNDIALS/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
set(PACKAGE_NAME SUNDIALS)
16-
set(PACKAGE_VERSION v7.1.0)
16+
set(PACKAGE_VERSION v7.3.0)
1717
set(PACKAGE_REPOSITORY sundials)
18-
set(RELEASE_TAG v7.1.0)
18+
set(RELEASE_TAG v7.3.0)
1919
set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
2020

2121
# Either retrieve or build our package.
@@ -24,49 +24,49 @@ if(LIBOPENCOR_PREBUILT_SUNDIALS)
2424
if(EMSCRIPTEN)
2525
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
2626
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
27-
beaac7ff588184603fa2948a88c77b3d7c32497d)
27+
3ce480076a375ac68b84e3a395805b1304f65ca3)
2828
else()
2929
if(WIN32)
3030
if(RELEASE_MODE)
3131
if(INTEL_MODE)
3232
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3333
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
34-
e9e378b1a309196bd927fc74eb2c4d1cd79ff8e3)
34+
6c3758026f18435d2ddba98ea6cdca03b720a905)
3535
else()
3636
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3737
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
38-
7719db0f3452902a45924680201fcd1fa963f7a4)
38+
6bccea22078cac44357cb8c2c70138f1c68837fc)
3939
endif()
4040
else()
4141
if(INTEL_MODE)
4242
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4343
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
44-
30f266957d7ef6eba73c09420bee526f333be481)
44+
0d62d71b789f05270852adb1b280711088304dfd)
4545
else()
4646
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4747
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
48-
27f18fc62a18feb5205076c1241c422ab71c5639)
48+
bed457c4b5430aa40a97fa2f403acba8648dadbe)
4949
endif()
5050
endif()
5151
elseif(APPLE)
5252
if(INTEL_MODE)
5353
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5454
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
55-
6523ab1ab7c8c53b7ae79221e433175db37b24ae)
55+
23db2411afd00e339667c7d8761d12dfd43e7c1a)
5656
else()
5757
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5858
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
59-
ecf881d34c3358997dd0fbb11b67bcb69e5b5a70)
59+
d889bfbf95f76518048523b0a59ca925f73b5b6b)
6060
endif()
6161
else()
6262
if(INTEL_MODE)
6363
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6464
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
65-
0df5457e2b7fe733926846d333495d1b408d846e)
65+
6b736ecb5d7bac1f54e75b81f2b733c49fc654d7)
6666
else()
6767
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6868
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
69-
db6dc34d20830370a3f247b338fdb91c897ee05a)
69+
d8e6b1ed20c2fa2557333e0c281e8e4ad622b09b)
7070
endif()
7171
endif()
7272
endif()

‎src/misc/compiler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ void *Compiler::Impl::function(const std::string &pName) const
359359
auto symbol = mLljit->lookup(pName);
360360

361361
if (symbol) {
362-
return reinterpret_cast<void *>(symbol->getAddress()); // NOLINT
362+
return reinterpret_cast<void *>(symbol->getValue()); // NOLINT
363363
}
364364

365365
return {};

‎tests/api/sed/instancetests.cpp‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,23 @@ namespace {
116116

117117
void runOdeModel(bool pCompiled)
118118
{
119-
static const libOpenCOR::ExpectedIssues expectedIssues = {
120-
{libOpenCOR::Issue::Type::ERROR, "At t = 0.00140014, mxstep steps taken before reaching tout."},
119+
const libOpenCOR::ExpectedIssues expectedIssues = {
120+
#ifdef BUILDING_ON_INTEL
121+
{libOpenCOR::Issue::Type::ERROR, "At t = 0.00140013827899996, mxstep steps taken before reaching tout."},
122+
#else
123+
{
124+
libOpenCOR::Issue::Type::ERROR,
125+
# ifdef BUILDING_ON_WINDOWS
126+
pCompiled ?
127+
"At t = 0.00140013827899821, mxstep steps taken before reaching tout." :
128+
"At t = 0.00140013827899996, mxstep steps taken before reaching tout.",
129+
# else
130+
pCompiled ?
131+
"At t = 0.00140013827899707, mxstep steps taken before reaching tout." :
132+
"At t = 0.00140013827900052, mxstep steps taken before reaching tout.",
133+
# endif
134+
},
135+
#endif
121136
};
122137

123138
auto file = libOpenCOR::File::create(libOpenCOR::resourcePath(libOpenCOR::CELLML_2_FILE));

‎tests/api/version/tests.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ TEST(VersionTest, libOpenCOR)
7474

7575
TEST(VersionTest, Clang)
7676
{
77-
EXPECT_EQ(0x140006U, libOpenCOR::clangVersion());
78-
EXPECT_EQ("14.0.6", libOpenCOR::clangVersionString());
77+
EXPECT_EQ(0x160006U, libOpenCOR::clangVersion());
78+
EXPECT_EQ("16.0.6", libOpenCOR::clangVersionString());
7979
}
8080

8181
TEST(VersionTest, libCellML)
@@ -104,12 +104,12 @@ TEST(VersionTest, libSEDML)
104104

105105
TEST(VersionTest, LLVM)
106106
{
107-
EXPECT_EQ(0x140006U, libOpenCOR::llvmVersion());
108-
EXPECT_EQ("14.0.6", libOpenCOR::llvmVersionString());
107+
EXPECT_EQ(0x160006U, libOpenCOR::llvmVersion());
108+
EXPECT_EQ("16.0.6", libOpenCOR::llvmVersionString());
109109
}
110110

111111
TEST(VersionTest, SUNDIALS)
112112
{
113-
EXPECT_EQ(0x070100U, libOpenCOR::sundialsVersion());
114-
EXPECT_EQ("7.1.0", libOpenCOR::sundialsVersionString());
113+
EXPECT_EQ(0x070300U, libOpenCOR::sundialsVersion());
114+
EXPECT_EQ("7.3.0", libOpenCOR::sundialsVersionString());
115115
}

‎tests/bindings/javascript/sed.instance.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ describe("Sed instance tests", () => {
252252
expectIssues(libopencor, instance, [
253253
[
254254
libopencor.Issue.Type.ERROR,
255-
"At t = 0.00140014, mxstep steps taken before reaching tout.",
255+
"At t = 0.00140013827899996, mxstep steps taken before reaching tout.",
256256
],
257257
]);
258258

‎tests/bindings/javascript/version.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe("Version tests", () => {
6767
});
6868

6969
test("SUNDIALS", () => {
70-
expect(libopencor.sundialsVersion()).toBe(0x070100);
71-
expect(libopencor.sundialsVersionString()).toBe("7.1.0");
70+
expect(libopencor.sundialsVersion()).toBe(0x070300);
71+
expect(libopencor.sundialsVersionString()).toBe("7.3.0");
7272
});
7373
});

‎tests/bindings/python/test_sed_instance.py‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,15 @@ def run_ode_model(compiled):
135135
expected_issues = [
136136
[
137137
oc.Issue.Type.Error,
138-
"At t = 0.00140014, mxstep steps taken before reaching tout.",
138+
(
139+
(
140+
"At t = 0.00140013827899707, mxstep steps taken before reaching tout."
141+
if compiled
142+
else "At t = 0.00140013827900052, mxstep steps taken before reaching tout."
143+
)
144+
if platform.system() == "Darwin"
145+
else "At t = 0.00140013827899996, mxstep steps taken before reaching tout."
146+
),
139147
],
140148
]
141149

0 commit comments

Comments
 (0)