Merged deveop on to branch

NREL · Mar 1, 2023 · b270448 · b270448
2 parents 65f0544 + fc854a4
commit b270448
Show file tree

Hide file tree

Showing 2,354 changed files with 25,458 additions and 17,182 deletions.
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -33,12 +33,16 @@ jobs:
             --suppress=functionConst:src/utilities/filetypes/WorkflowStep.hpp \
             --suppress=functionConst:src/utilities/filetypes/WorkflowStepResult.hpp \
             --suppress=redundantAssignment:src/utilities/sql/SqlFile.hpp \
+            --suppress=constParameterCallback:src/utilities/idd/benchmark/IddObjectParse_Benchmark.cpp \
+            --suppress=constParameterCallback:src/utilities/idd/benchmark/LoadIdd_Benchmark.cpp \
+            --suppress=constParameterCallback:src/utilities/idf/benchmark/IdfObjectParse_Benchmark.cpp \
+            --suppress=constParameterCallback:src/utilities/idf/benchmark/LoadIdfFile_Benchmark.cpp \
             --suppress=constStatement:src/utilities/geometry/Intersection.cpp \
             --inline-suppr \
             --inconclusive \
             --template='[{file}:{line}]:({severity}),[{id}],{message}' \
             -j $(nproc) \
-            --force \
+            --max-configs=1 \
             -i src/cli/test \
             -i src/airflow/contam \
             -i src/polypartition \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -286,6 +286,14 @@ mark_as_advanced(BUILD_PYTHON_BINDINGS)
 option(BUILD_TESTING "Build testing targets" OFF)
 
 option(BUILD_BENCHMARK "Build benchmarking targets" OFF)
+if(BUILD_BENCHMARK)
+  configure_file(${PROJECT_SOURCE_DIR}/developer/python/run_benchmark.py ${PROJECT_BINARY_DIR}/run_benchmark.py COPYONLY)
+  add_custom_target(run_benchmarks
+    COMMAND python run_benchmark.py --quiet --all
+    DEPENDS "${PROJECT_BINARY_DIR}/run_benchmark.py"
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  )
+endif()
 
 option(BUILD_RUBY_BINDINGS "Build Ruby bindings" ON)
 mark_as_advanced(BUILD_RUBY_BINDINGS)