diff --git a/CMakeLists.txt b/CMakeLists.txt index 64b445a64..0e7100efe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR) set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.05) find_package(cetmodules REQUIRED) -project(sbndcode LANGUAGES CXX) +project(sbndcode VERSION ${${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING} LANGUAGES CXX) # for CI: # project(sbndcode VERSION 10.05.00) @@ -57,6 +57,7 @@ message(STATUS "${PROJECT_NAME} repository tag: ${GIT_REPOSITORY_TAG}") install_source(LIST RepositoryTag) # these are minimum required versions, not the actual product versions +find_package( protobuf REQUIRED ) find_package( art REQUIRED ) find_package( art_root_io REQUIRED ) find_package( artdaq_core REQUIRED ) diff --git a/sbndcode/Commissioning/CMakeLists.txt b/sbndcode/Commissioning/CMakeLists.txt index c3154622a..8f9c42cee 100644 --- a/sbndcode/Commissioning/CMakeLists.txt +++ b/sbndcode/Commissioning/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(fcls) - +include_directories(${HEP_HPC_INCLUDE_DIRS}) +include_directories($ENV{OPENMPI_INCLUDE_DIR}) set( MODULE_LIBRARIES larcorealg::Geometry diff --git a/sbndcode/SBNDCVN/tf/tf_graph.cc b/sbndcode/SBNDCVN/tf/tf_graph.cc index 731de3f1e..c30c102f4 100644 --- a/sbndcode/SBNDCVN/tf/tf_graph.cc +++ b/sbndcode/SBNDCVN/tf/tf_graph.cc @@ -11,8 +11,8 @@ #include "tf_graph.h" +#include "tensorflow/cc/saved_model/constants.h" #include "tensorflow/cc/saved_model/loader.h" -#include "tensorflow/cc/saved_model/tag_constants.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/public/session_options.h" @@ -51,7 +51,7 @@ tf::Graph::Graph(const char* graph_file_name, status = tensorflow::LoadSavedModel(tensorflow::SessionOptions(), tensorflow::RunOptions(), graph_file_name, - {tensorflow::kSavedModelTagServe}, + {}, fBundle); std::cout << "tf_graph loaded SavedModelBundle with status: " << status.ToString() << std::endl; if (!status.ok()) return; diff --git a/test/ci/CMakeLists.txt b/test/ci/CMakeLists.txt index 738b9c022..b50888112 100644 --- a/test/ci/CMakeLists.txt +++ b/test/ci/CMakeLists.txt @@ -51,4 +51,4 @@ install_scripts(AS_TEST) install_fhicl() -install(FILES fcl_file_checks.list DESTINATION "${sbndcode_UPS_PRODUCT_NAME}/${sbndcode_UPS_PRODUCT_VERSION}/test") +install(FILES fcl_file_checks.list DESTINATION "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/${PROJECT_VERSION}/test")