Skip to content

Changes required to build with Spack mpd and tensorflow 2.17 #936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gartung wants to merge 8 commits into
base: develop
Choose a base branch
from
+6 −5
Open

Changes required to build with Spack mpd and tensorflow 2.17 #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac2987d
Changes needed to accomodate removal of deprecated headers in newer T…
gartung Feb 5, 2026
d5db338
Add find_package(protobuf REQUIRED) before call other packages which …
gartung Feb 5, 2026
bfaca6c
additional CMakeLists.txt changes needed for Spack build
gartung Feb 5, 2026
375c02a
Merge branch 'develop' into spack-build
gartung Jun 17, 2026
2c8e876
tensorflow/cc/saved_model/bundle_v2.h not needed.
gartung Jun 17, 2026
c3df63f
Set VERSION ${${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING}
gartung Jun 18, 2026
439b7ed
Replace kSavedModelServer defined in missing tag_constants.h with "se…
gartung Jun 24, 2026
28a933c
constants.h is not needed
gartung Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion sbndcode/Commissioning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
add_subdirectory(fcls)

include_directories(${HEP_HPC_INCLUDE_DIRS})
include_directories($ENV{OPENMPI_INCLUDE_DIR})
set(
MODULE_LIBRARIES
larcorealg::Geometry
Expand Down
3 changes: 1 addition & 2 deletions sbndcode/SBNDCVN/tf/tf_graph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "tf_graph.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"
Expand Down Expand Up @@ -51,7 +50,7 @@ tf::Graph::Graph(const char* graph_file_name,
status = tensorflow::LoadSavedModel(tensorflow::SessionOptions(),
tensorflow::RunOptions(),
graph_file_name,
{tensorflow::kSavedModelTagServe},
{"serve"},
fBundle);
std::cout << "tf_graph loaded SavedModelBundle with status: " << status.ToString() << std::endl;
if (!status.ok()) return;
Expand Down
2 changes: 1 addition & 1 deletion test/ci/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")