Skip to content

Commit 9e8057b

Browse files
authored
Remove unused drivers; put others in more reasonable place (#2382)
1 parent e8fb32d commit 9e8057b

File tree

9 files changed

+27
-823
lines changed

9 files changed

+27
-823
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,9 @@ if (LBANN_DEBUG_PRINT_SUBTARGETS)
852852
lbann_print_all_subtargets(lbann)
853853
endif ()
854854

855+
# Build the LBANN drivers
856+
add_subdirectory(src/drivers)
857+
855858
# Add the rest of the things
856859
add_subdirectory(data_utils)
857860
add_subdirectory(model_zoo)

model_zoo/CMakeLists.txt

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,3 @@
1-
# This executable has to be given a different target name since the
2-
# library target name is "lbann".
3-
add_executable(lbann-bin lbann.cpp)
4-
target_link_libraries(lbann-bin lbann)
5-
set_target_properties(lbann-bin
6-
PROPERTIES
7-
OUTPUT_NAME lbann
8-
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
9-
10-
set(LBANN_EXE_TGTS lbann-bin)
11-
12-
set(EXE_SRCS
13-
lbann_help.cpp
14-
lbann_gan.cpp
15-
lbann_cycgan.cpp
16-
lbann_aecycgan.cpp
17-
lbann_inf.cpp)
18-
foreach (_src IN LISTS EXE_SRCS)
19-
get_filename_component(TGT_NAME "${_src}" NAME_WE)
20-
string(REPLACE "_" "-" TGT_NAME "${TGT_NAME}")
21-
22-
add_executable(${TGT_NAME} "${_src}")
23-
target_link_libraries(${TGT_NAME} lbann)
24-
set_target_properties(${TGT_NAME}
25-
PROPERTIES
26-
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
27-
28-
list(APPEND LBANN_EXE_TGTS ${TGT_NAME})
29-
endforeach ()
30-
31-
# Install the binaries
32-
install(
33-
TARGETS lbann-bin lbann-gan lbann-cycgan lbann-aecycgan
34-
lbann-help lbann-inf
35-
EXPORT LBANNTargets
36-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
37-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
38-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
39-
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
40-
)
41-
421
# Install the relevant prototext
432
install(FILES README.md DESTINATION ${CMAKE_INSTALL_DATADIR}/model_zoo)
443
install(DIRECTORY data_readers models optimizers tests

model_zoo/lbann_aecycgan.cpp

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

0 commit comments

Comments
 (0)