Remove last bits of Zoltan (#954)

sstsimulator · May 25, 2023 · 3c22b62 · 3c22b62
1 parent 6ca52d0
commit 3c22b62
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/experimental/cmake_configure_files/sstsimulator.conf.in b/experimental/cmake_configure_files/sstsimulator.conf.in
@@ -27,8 +27,6 @@ PYTHON_CONFIG=${Python_CONFIG}
 PYTHON_CPPFLAGS=-I${Python_INCLUDE_DIRS} 
 PYTHON_LDFLAGS=${Python_LIBRARIES}
 PYTHON_VERSION3=yes
-ZOLTAN_CPPFLAGS=
-ZOLTAN_LDFLAGS=
 LIBZ_CPPFLAGS=${ZLIB_INCLUDE_DIRS}
 LIBZ_LDFLAGS=${ZLIB_LIBRARIES}
 LIBZ_LIBS=-lz

diff --git a/src/sst/core/Makefile.am b/src/sst/core/Makefile.am
@@ -8,7 +8,6 @@ CXX = $(MPICXX)
 AM_CPPFLAGS =  \
 	-DTIXML_USE_STL \
 	-DSST_BUILDING_CORE=1 \
-	$(ZOLTAN_CPPFLAGS) \
 	$(PYTHON_CPPFLAGS) \
 	-I$(top_srcdir)/external \
 	$(LTDLINCL)
@@ -292,26 +291,22 @@ sstinfo_x_SOURCES = \
 
 sstsim_x_LDADD = \
 	$(PYTHON_LIBS) \
-	$(ZOLTAN_LIB) \
 	$(MPILIBS) \
 	$(TCMALLOC_LIB) \
 	-lm
 
 sstsim_x_LDFLAGS = \
-	$(ZOLTAN_LDFLAGS) \
 	$(TCMALLOC_LDFLAGS) \
 	$(PYTHON_LDFLAGS) \
 	-export-dynamic \
 	$(SST_LTLIBS_ELEMLIBS)
 
 sstinfo_x_LDADD = \
-	$(ZOLTAN_LIB) \
 	$(MPILIBS) \
 	$(TCMALLOC_LIB) \
 	-lm
 
 sstinfo_x_LDFLAGS = \
-	$(ZOLTAN_LDFLAGS) \
 	$(TCMALLOC_LDFLAGS) \
 	$(PYTHON_LDFLAGS) \
 	-export-dynamic \

diff --git a/src/sst/core/impl/partitioners/CMakeLists.txt b/src/sst/core/impl/partitioners/CMakeLists.txt
@@ -18,7 +18,4 @@ add_library(partitioner OBJECT linpart.cc rrobin.cc selfpart.cc simplepart.cc
 target_include_directories(partitioner PUBLIC ${SST_TOP_SRC_DIR}/src/)
 target_link_libraries(partitioner PUBLIC sst-config-headers)
 
-# Not supporting ZOLTAN with CMake if(ZOLTAN_FOUND)
-# target_sources(libpartitioner zoltpart.cc) endif(ZOLTAN_FOUND)
-
 # EOF
diff --git a/src/sst/sst.conf b/src/sst/sst.conf
@@ -27,8 +27,6 @@ PYTHON_CONFIG=@PYTHON_CONFIG_EXE@
 PYTHON_CPPFLAGS=@PYTHON_CPPFLAGS@
 PYTHON_LDFLAGS=@PYTHON_LDFLAGS@
 PYTHON_VERSION3=@PYTHON_VERSION3@
-ZOLTAN_CPPFLAGS=@ZOLTAN_CPPFLAGS@
-ZOLTAN_LDFLAGS=@ZOLTAN_LDFLAGS@
 LIBZ_CPPFLAGS=@LIBZ_CPPFLAGS@
 LIBZ_LDFLAGS=@LIBZ_LDFLAGS@
 LIBZ_LIBS=@LIBZ_LIBS@