Skip to content

Commit e3f2d85

Browse files
committed
[1.3.37] 2025-06-27
* Updated `utilities/run_samples.sh` to have an option to redirect command outputs to a user-specified log file. * Updated all testing workflows to print the output log if the run fails. * Many documentation updates and fixes. * Renamed this file to `CHANGELOG.md` and added markdown formatting. 🚨+ NEW PLUG-IN + 🚨 - Added a new plant hydraulics plug-in. Credit to Kyle Rizzo for developing this plug-in. ## Context - Added overloaded + and - operators for `helios::RGBcolor` and `helios::RGBAcolor` vector types. ## Plant Architecture - Fixed a bug in `PlantArchitecture::interpolateTube()`. - Added 10 self-tests. ## Radiation - Refined `RadiationModel::applyImageProcessingPipeline()`. It now performs a standard set of processing steps, and has an option to apply HDR toning.
1 parent 5d05051 commit e3f2d85

File tree

526 files changed

+46864
-35596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+46864
-35596
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ AlignConsecutiveAssignments: false
66
AlignConsecutiveDeclarations: false
77
AlignOperands: true
88
AlignTrailingComments: false
9+
AllowShortFunctionsOnASingleLine: None
910
AlwaysBreakTemplateDeclarations: Yes
1011
BraceWrapping:
1112
AfterCaseLabel: false

.github/workflows/linux_GPU_selftests.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ jobs:
3636
- name: Bash script
3737
run: |
3838
cd utilities
39-
./run_samples.sh --visbuildonly
39+
if ! ./run_samples.sh --visbuildonly --log-file linux_GPU_selftests.log; then
40+
echo "==== run_samples.sh failed; dumping linux_GPU_selftests.log ===="
41+
cat linux_GPU_selftests.log
42+
exit 1
43+
fi
4044
4145

4246
stop-gpu:

.github/workflows/linux_selftests.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,8 @@ jobs:
4242
- name: Bash script
4343
run: |
4444
cd utilities
45-
./run_samples.sh --nogpu --visbuildonly
45+
if ! ./run_samples.sh --nogpu --visbuildonly --log-file linux_selftests.log; then
46+
echo "==== run_samples.sh failed; dumping linux_selftests.log ===="
47+
cat linux_selftests.log
48+
exit 1
49+
fi

.github/workflows/mac_selftests.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ jobs:
2828
- name: Bash script
2929
run: |
3030
cd utilities
31-
./run_samples.sh --nogpu --visbuildonly
31+
if ! ./run_samples.sh --nogpu --visbuildonly --log-file macos_selftests.log; then
32+
echo "==== run_samples.sh failed; dumping macos_selftests.log ===="
33+
cat macos_selftests.log
34+
exit 1
35+
fi

.github/workflows/windows_selftests.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ jobs:
2323
- uses: ilammy/msvc-dev-cmd@v1
2424

2525
- name: Bash script
26+
shell: bash
2627
run: |
2728
cd utilities
28-
sh run_samples.sh --nogpu --visbuildonly
29+
if ! ./run_samples.sh --nogpu --visbuildonly --log-file windows_selftests.log; then
30+
echo "==== run_samples.sh failed; dumping windows_selftests.log ===="
31+
cat windows_selftests.log
32+
exit 1
33+
fi

core/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ target_include_directories(helios
2525
)
2626

2727
# External libraries
28+
set(SAVED_LOG_LEVEL ${CMAKE_MESSAGE_LOG_LEVEL})
29+
set(CMAKE_MESSAGE_LOG_LEVEL WARNING)
30+
2831
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/lib/zlib")
2932
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/zlib" "${CMAKE_BINARY_DIR}/lib/zlib")
3033

@@ -37,6 +40,8 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libjpeg-9a" "${CMAKE_BINARY_DI
3740

3841
target_link_libraries( helios PRIVATE png_static jpeg ) #note that zlib is already linked by libpng
3942

43+
set(CMAKE_MESSAGE_LOG_LEVEL ${SAVED_LOG_LEVEL})
44+
4045
file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib/images" DESTINATION "${CMAKE_BINARY_DIR}/lib/" )
4146
file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib/models" DESTINATION "${CMAKE_BINARY_DIR}/lib/" )
4247
file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib/testdata" DESTINATION "${CMAKE_BINARY_DIR}/lib/" )

core/CMake_project.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if(GIT_FOUND)
1818
OUTPUT_VARIABLE GIT_COMMIT_HASH
1919
OUTPUT_STRIP_TRAILING_WHITESPACE
2020
)
21+
message( STATUS "[Helios] Detected Git commit hash: ${GIT_COMMIT_HASH}" )
2122
else()
2223
set(GIT_COMMIT_HASH "unknown")
2324
endif()
@@ -26,6 +27,7 @@ endif()
2627
if(NOT DEFINED HELIOS_PREVIOUS_COMMIT)
2728
set(HELIOS_PREVIOUS_COMMIT "" CACHE STRING "Last configured Helios Git commit")
2829
endif()
30+
message( STATUS "[Helios] Last configured Helios Git commit hash: ${HELIOS_PREVIOUS_COMMIT}" )
2931

3032
if(NOT HELIOS_PREVIOUS_COMMIT STREQUAL GIT_COMMIT_HASH)
3133
message(STATUS "[Helios] Git commit version change detected, automatically re-configuring...")
@@ -75,11 +77,11 @@ endif()
7577

7678
# -- linking plug-ins --#
7779
LIST(LENGTH PLUGINS PLUGIN_COUNT)
78-
message("-- Loading ${PLUGIN_COUNT} plug-ins")
80+
message( STATUS "[Helios] Loading ${PLUGIN_COUNT} plug-ins")
7981
foreach(PLUGIN ${PLUGINS})
80-
message("-- loading plug-in ${PLUGIN}")
82+
message( STATUS "[Helios] Loading plug-in ${PLUGIN}")
8183
if( ${PLUGIN} STREQUAL ${EXECUTABLE_NAME} )
82-
message( FATAL_ERROR "The executable name cannot be the same as a plugin name. Please rename your executable." )
84+
message( FATAL_ERROR "[Helios] The executable name cannot be the same as a plugin name. Please rename your executable." )
8385
endif()
8486
add_subdirectory( "${BASE_DIRECTORY}/plugins/${PLUGIN}" "${PROJECT_BINARY_DIR}/plugins/${PLUGIN}" )
8587
target_link_libraries( ${EXECUTABLE_NAME} ${PLUGIN} )
@@ -98,14 +100,14 @@ target_include_directories(helios PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/
98100
if( ENABLE_OPENMP )
99101
find_package(OpenMP)
100102
if (OpenMP_CXX_FOUND)
101-
message( "-- Enabling experimental OpenMP support" )
103+
message( STATUS "[Helios] Enabling experimental OpenMP support" )
102104
target_link_libraries(helios PUBLIC OpenMP::OpenMP_CXX)
103105
target_compile_definitions(helios PUBLIC USE_OPENMP)
104106
else()
105107
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
106-
message(WARNING "You are using Apple Clang compiler, which does not support OpenMP. The program will compile without OpenMP support.")
108+
message(WARNING "[Helios] You are using Apple Clang compiler, which does not support OpenMP. The program will compile without OpenMP support.")
107109
else()
108-
message(WARNING "OpenMP not found! The program will compile without OpenMP support.")
110+
message(WARNING "[Helios] OpenMP not found! The program will compile without OpenMP support.")
109111
endif()
110112
endif()
111113
endif()

0 commit comments

Comments
 (0)