Skip to content

Commit de2e4c3

Browse files
committed
remove deprecated Conduit serialization code paths
1 parent 69e87ba commit de2e4c3

File tree

10 files changed

+0
-489
lines changed

10 files changed

+0
-489
lines changed

tsd/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
3333
## Global options ##
3434

3535
option(BUILD_INTERACTIVE_APPS "Build interactive applications" ON)
36-
option(TSD_ENABLE_SERIALIZATION "Use conduit to serialize contexts" OFF)
3736
option(TSD_USE_HDF5 "Support loading AMR grids from HDF5" OFF)
3837
option(TSD_USE_ASSIMP "Support loading geometry with libassimp" OFF)
3938
option(TSD_USE_SDL3 "Use SDL3 interop in render pipeline" ON)

tsd/apps/interactive/common/AppCore.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ void AppCore::parseCommandLine(int argc, const char **argv)
106106
else if (arg == "-tsd") {
107107
importerType = ImporterType::TSD;
108108
this->commandLine.loadingContext = true;
109-
} else if (arg == "-tsdc") {
110-
importerType = ImporterType::TSD_CONDUIT;
111-
this->commandLine.loadingContext = true;
112109
} else if (arg == "-hdri")
113110
importerType = ImporterType::HDRI;
114111
else if (arg == "-dlaf")
@@ -164,8 +161,6 @@ void AppCore::setupSceneFromCommandLine(bool hdriOnly)
164161
auto root = tsd.ctx.defaultLayer()->root();
165162
if (f.first == ImporterType::TSD)
166163
tsd::load_Context(tsd.ctx, f.second.c_str());
167-
else if (f.first == ImporterType::TSD_CONDUIT)
168-
tsd::load_Context_Conduit(tsd.ctx, f.second.c_str());
169164
else if (f.first == ImporterType::PLY)
170165
tsd::import_PLY(tsd.ctx, f.second.c_str());
171166
else if (f.first == ImporterType::OBJ)

tsd/apps/interactive/common/AppCore.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ enum class ImporterType
3939
HSMESH,
4040
NEURAL,
4141
TSD,
42-
TSD_CONDUIT,
4342
NONE
4443
};
4544

tsd/apps/tools/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
## Copyright 2024-2025 NVIDIA Corporation
22
## SPDX-License-Identifier: Apache-2.0
33

4-
project(conduit2tsd)
5-
project_add_executable(conduit2tsd.cpp)
6-
project_link_libraries(tsd)
7-
84
project(obj2header)
95
project_add_executable(obj2header.cpp)
106
project_link_libraries(tsd tsd_tiny_obj_loader)

tsd/apps/tools/conduit2tsd.cpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

tsd/external/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
## SPDX-License-Identifier: Apache-2.0
33

44
add_subdirectory(tsd_catch)
5-
add_subdirectory(tsd_conduit)
65
add_subdirectory(tsd_flip)
76
add_subdirectory(tsd_mikktspace)
87
add_subdirectory(tsd_nanovdb)

tsd/external/tsd_conduit/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

tsd/src/tsd/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ PRIVATE
4242
authoring/procedural/generate_noiseVolume.cpp
4343
authoring/procedural/generate_randomSpheres.cpp
4444
authoring/procedural/generate_rtow.cpp
45-
authoring/serialization/serialization_conduit.cpp
4645
authoring/serialization/serialization_datatree.cpp
4746
core/AnariObjectCache.cpp
4847
core/Context.cpp
@@ -136,19 +135,6 @@ else()
136135
project_compile_definitions(PUBLIC -DTSD_USE_CUDA=0)
137136
endif()
138137

139-
if (TSD_ENABLE_SERIALIZATION)
140-
project_link_libraries(PRIVATE tsd_conduit)
141-
set_source_files_properties(authoring/serialization/serialization_conduit.cpp
142-
PROPERTIES
143-
COMPILE_DEFINITIONS TSD_ENABLE_SERIALIZATION=1
144-
)
145-
else()
146-
set_source_files_properties(authoring/serialization/serialization_conduit.cpp
147-
PROPERTIES
148-
COMPILE_DEFINITIONS TSD_ENABLE_SERIALIZATION=0
149-
)
150-
endif()
151-
152138
if (TSD_USE_HDF5)
153139
find_package(HDF5 REQUIRED COMPONENTS CXX)
154140
project_compile_definitions(PRIVATE -DTSD_USE_HDF5=1)

tsd/src/tsd/authoring/serialization.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ void save_Context(Context &ctx, serialization::DataNode &root);
2121
void load_Context(Context &ctx, const char *filename);
2222
void load_Context(Context &ctx, serialization::DataNode &root);
2323

24-
void save_Context_Conduit(Context &ctx, const char *filename);
25-
void load_Context_Conduit(Context &ctx, const char *filename);
26-
2724
// clang-format on
2825

2926
} // namespace tsd

0 commit comments

Comments
 (0)