From 12493387a24d210d3b5e05a928e1d97d881da8af Mon Sep 17 00:00:00 2001 From: Alexander Nikolic Date: Fri, 11 Jul 2025 14:19:22 +0200 Subject: [PATCH 1/5] Case for unix build adjusted --- CMakeLists.txt | 6 +++++- dcp/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b6763e..efbfeac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,11 @@ find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) if(ENABLE_DCP) - find_package(xercesc REQUIRED) + if(UNIX) + find_package(XercesC REQUIRED) + else() + find_package(xercesc REQUIRED) + endif() find_package(Threads REQUIRED) find_package(ASIO REQUIRED) find_package(DCPLib REQUIRED) diff --git a/dcp/CMakeLists.txt b/dcp/CMakeLists.txt index 1581c9c..4d69c77 100644 --- a/dcp/CMakeLists.txt +++ b/dcp/CMakeLists.txt @@ -15,7 +15,11 @@ project(dcp_executables) option(ENABLE_DCP_DEBUG "Turn on debug output of the DCP slaves" OFF) # dependencies -find_package(xercesc REQUIRED) +if(UNIX) + find_package(XercesC REQUIRED) +else() + find_package(xercesc REQUIRED) +endif() find_package(ASIO REQUIRED) find_package(DCPLib REQUIRED) From ddd573576c6fe68d69a3207b453463d9da96e9fa Mon Sep 17 00:00:00 2001 From: Alexander Nikolic Date: Fri, 11 Jul 2025 14:20:16 +0200 Subject: [PATCH 2/5] Fixed URL for dcp_fmu model.ssd --- examples/dcp_fmu/model.ssd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dcp_fmu/model.ssd b/examples/dcp_fmu/model.ssd index 12d2674..d825177 100644 --- a/examples/dcp_fmu/model.ssd +++ b/examples/dcp_fmu/model.ssd @@ -6,7 +6,7 @@ name="connections"> - + From 10dcd52250434a47472290580017f2463973a2d8 Mon Sep 17 00:00:00 2001 From: Alexander Nikolic Date: Fri, 11 Jul 2025 14:22:57 +0200 Subject: [PATCH 3/5] Added dependencies for DCPLib --- .devcontainer/Dockerfile | 1 + docker/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 18ca73f..56b43fd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,4 +15,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y python-is-python3 && \ apt-get install -y build-essential && \ apt-get install -y libxml2-dev zlib1g-dev && \ + apt-get install -y libasio-dev libxerces-c-dev libzip-dev && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile b/docker/Dockerfile index 72ad5e5..878f334 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,4 +15,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y build-essential && \ apt-get install -y python-is-python3 python3-numpy && \ apt-get install -y libxml2-dev zlib1g-dev && \ + apt-get install -y libasio-dev libxerces-c-dev libzip-dev && \ rm -rf /var/lib/apt/lists/* From 9071f51260356efcec22cb1008f5f9cec8cd1c26 Mon Sep 17 00:00:00 2001 From: Alexander Nikolic Date: Fri, 11 Jul 2025 14:24:37 +0200 Subject: [PATCH 4/5] run_tests.py won't find the reference folder for dcp_fmu because it does not exist. Decided to skip comparing results. --- run_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/run_tests.py b/run_tests.py index 3b663f3..7282d64 100644 --- a/run_tests.py +++ b/run_tests.py @@ -79,6 +79,7 @@ def _run_tests(exe, test_dir): # check reference files test_passed = True ref_dir = os.path.join(test_dir_abs_path, example, "reference") + if os.path.exists(ref_dir): for res in os.listdir(ref_dir): if not res.endswith(".csv"): continue From 24273ef39dcf7cb337eabd41b90c6d23318e2e9c Mon Sep 17 00:00:00 2001 From: Alexander Nikolic Date: Fri, 11 Jul 2025 14:33:55 +0200 Subject: [PATCH 5/5] run_tests.py indentation fixed --- run_tests.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/run_tests.py b/run_tests.py index 7282d64..7a2ee1a 100644 --- a/run_tests.py +++ b/run_tests.py @@ -80,26 +80,26 @@ def _run_tests(exe, test_dir): test_passed = True ref_dir = os.path.join(test_dir_abs_path, example, "reference") if os.path.exists(ref_dir): - for res in os.listdir(ref_dir): - if not res.endswith(".csv"): - continue - - res_path = os.path.join("results", res) - ref_path = os.path.join(ref_dir, res) - - if not os.path.exists(res_path): - print("Results {} are missing".format(res)) - test_passed = False - - res_data = np.genfromtxt(res_path, delimiter=',', skip_header=3) - ref_data = np.genfromtxt(ref_path, delimiter=',', skip_header=3) - diff_data = ref_data - res_data - - for i, j in np.ndindex(diff_data.shape): - if abs(diff_data[i, j]) > 1e-8: - print("Results {} do not match".format(res)) - test_passed = False - break + for res in os.listdir(ref_dir): + if not res.endswith(".csv"): + continue + + res_path = os.path.join("results", res) + ref_path = os.path.join(ref_dir, res) + + if not os.path.exists(res_path): + print("Results {} are missing".format(res)) + test_passed = False + + res_data = np.genfromtxt(res_path, delimiter=',', skip_header=3) + ref_data = np.genfromtxt(ref_path, delimiter=',', skip_header=3) + diff_data = ref_data - res_data + + for i, j in np.ndindex(diff_data.shape): + if abs(diff_data[i, j]) > 1e-8: + print("Results {} do not match".format(res)) + test_passed = False + break if test_passed: print("\tSUCCESS")