Merge pull request #6718 from akva2/hybrid_newton_no_tensorflow

HybridNewton: no longer requires tensorflow
This commit is contained in:
Bård Skaflestad authored and GitHub committed 2026-01-09 11:33:59 +01:00
commit 07385a396e
1 file changed
+19 -26
+19 -26
View File
@@ -1,29 +1,22 @@
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/tests/integration/HybridNewton)
execute_process(
COMMAND "${Python3_EXECUTABLE}" -c "import tensorflow"
RESULT_VARIABLE PYTHON_HAS_TENSORFLOW
OUTPUT_QUIET
ERROR_QUIET
add_test(NAME
HybridNewton
COMMAND
${Python3_EXECUTABLE}
-m unittest discover
${PROJECT_SOURCE_DIR}/python/integration_tests/ml/hybrid_newton
WORKING_DIRECTORY
${PROJECT_BINARY_DIR}/tests/integration/HybridNewton
)
if(PYTHON_HAS_TENSORFLOW EQUAL 0)
add_test(NAME
HybridNewton
COMMAND
${Python3_EXECUTABLE}
-m unittest discover
${PROJECT_SOURCE_DIR}/python/integration_tests/ml/hybrid_newton
WORKING_DIRECTORY
${PROJECT_BINARY_DIR}/tests/integration/HybridNewton
)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
set(modifications
"PYTHONPATH=path_list_append:${opm-common_DIR}/python"
"PYTHONPATH=path_list_append:${CMAKE_CURRENT_BINARY_DIR}/python"
"FLOW_BINARY=set:$<TARGET_FILE:flow>"
)
set_tests_properties(HybridNewton PROPERTIES
ENVIRONMENT_MODIFICATION
"${modifications}"
)
endif()
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
set(modifications
"PYTHONPATH=path_list_append:${opm-common_DIR}/python"
"PYTHONPATH=path_list_append:${CMAKE_CURRENT_BINARY_DIR}/python"
"FLOW_BINARY=set:$<TARGET_FILE:flow>"
)
set_tests_properties(HybridNewton PROPERTIES
ENVIRONMENT_MODIFICATION
"${modifications}"
)
endif()