[ShogunBoard] Guard everything TFLogger related.

Add a HAVE_TFLOGGER flag.
shogun-toolbox · Jul 12, 2017 · 91ac0de · 91ac0de
1 parent 392ecd2
commit 91ac0de
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 14 deletions.
diff --git a/src/interfaces/swig/ParameterObserver.i b/src/interfaces/swig/ParameterObserver.i
@@ -1,3 +1,5 @@
+#ifdef HAVE_TFLOGGER
+
 %include "std_vector.i"
 %include "std_string.i"
 %template(ParameterList) std::vector<std::string>;
@@ -13,3 +15,5 @@
 %include <shogun/lib/ParameterObserverTensorBoard.h>
 %include <shogun/lib/ParameterObserverScalar.h>
 %include <shogun/lib/ParameterObserverHistogram.h>
+
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt
@@ -287,15 +287,9 @@ ENDIF()
 # TFLogger package
 FIND_PACKAGE(TFLogger 0.1.0 CONFIG)
 IF (TFLogger_FOUND)
+    SET(HAVE_TFLOGGER 1)
     SHOGUN_INCLUDE_DIRS(SCOPE PRIVATE SYSTEM ${TFLogger_INCLUDE_DIR})
     target_link_libraries(shogun PRIVATE tflogger::tflogger)
-ELSE()
-    include(external/tflogger)
-    SHOGUN_INCLUDE_DIRS(SCOPE PRIVATE SYSTEM
-            $<BUILD_INTERFACE:${TFLogger_INCLUDE_DIR}>
-            $<INSTALL_INTERFACE:include/shogun/lib/external/tflogger>
-            )
-    target_link_libraries(shogun PRIVATE tflogger::tflogger)
 ENDIF()
 
 #### LAPACK

diff --git a/src/shogun/io/TBOutputFormat.cpp b/src/shogun/io/TBOutputFormat.cpp
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #include <chrono>
 #include <vector>
@@ -117,3 +119,5 @@ tensorflow::Event TBOutputFormat::convert_vector(
 
 	return e;
 }
+
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/io/TBOutputFormat.h b/src/shogun/io/TBOutputFormat.h
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #ifndef SHOGUN_OUTPUTFORMAT_H
 #define SHOGUN_OUTPUTFORMAT_H
@@ -47,3 +49,4 @@ namespace shogun
 }
 
 #endif // SHOGUN_OUTPUTFORMAT_H
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverHistogram.cpp b/src/shogun/lib/ParameterObserverHistogram.cpp
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #include <shogun/io/TBOutputFormat.h>
 #include <shogun/lib/ParameterObserverHistogram.h>
@@ -25,7 +27,6 @@ ParameterObserverHistogram::ParameterObserverHistogram(
 }
 
 ParameterObserverHistogram::~ParameterObserverHistogram()
-    : ~ParameterObserverTensorBoard()
 {
 }
 
@@ -56,3 +57,5 @@ bool ParameterObserverHistogram::filter(const std::string& param)
 			return true;
 	return false;
 }
+
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverHistogram.h b/src/shogun/lib/ParameterObserverHistogram.h
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #ifndef SHOGUN_PARAMETEROBSERVERHISTOGRAM_H
 #define SHOGUN_PARAMETEROBSERVERHISTOGRAM_H
@@ -32,3 +34,4 @@ namespace shogun
 }
 
 #endif // SHOGUN_PARAMETEROBSERVERHISTOGRAM_H
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverScalar.cpp b/src/shogun/lib/ParameterObserverScalar.cpp
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #include <shogun/io/TBOutputFormat.h>
 #include <shogun/lib/ParameterObserverScalar.h>
@@ -25,7 +27,6 @@ ParameterObserverScalar::ParameterObserverScalar(
 }
 
 ParameterObserverScalar::~ParameterObserverScalar()
-    : ~ParameterObserverTensorBoard()
 {
 }
 
@@ -56,3 +57,5 @@ bool ParameterObserverScalar::filter(const std::string& param)
 			return true;
 	return false;
 }
+
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverScalar.h b/src/shogun/lib/ParameterObserverScalar.h
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #ifndef SHOGUN_PARAMETEROBSERVERSCALAR_H
 #define SHOGUN_PARAMETEROBSERVERSCALAR_H
@@ -32,3 +34,4 @@ namespace shogun
 }
 
 #endif // SHOGUN_PARAMETEROBSERVERSCALAR_H
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverTensorBoard.cpp b/src/shogun/lib/ParameterObserverTensorBoard.cpp
@@ -1,6 +1,8 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #include "ParameterObserverTensorBoard.h"
 
@@ -27,8 +29,9 @@ ParameterObserverTensorBoard::ParameterObserverTensorBoard(
 }
 
 ParameterObserverTensorBoard::~ParameterObserverTensorBoard()
-    : ~ParameterObserverTensorBoard()
 {
 	m_writer.flush();
 	m_writer.close();
 }
+
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/ParameterObserverTensorBoard.h b/src/shogun/lib/ParameterObserverTensorBoard.h
@@ -1,13 +1,15 @@
 /*
 * Written (W) 2017 Giovanni De Toni
 */
+#include <shogun/lib/config.h>
+#ifdef HAVE_TFLOGGER
 
 #ifndef SHOGUN_PARAMETEROBSERVERTENSORBOARD_H
 #define SHOGUN_PARAMETEROBSERVERTENSORBOARD_H
 
 #include <shogun/lib/ParameterObserverInterface.h>
 
-#include <tflogger/tensorflow_logger.h>
+#include <tflogger/event_logger.h>
 
 namespace shogun
 {
@@ -42,8 +44,9 @@ namespace shogun
 		/**
 		* Writer object which will be used to write tensorflow::Event files
 		*/
-		tflogger::TensorFlowLogger m_writer;
+		tflogger::EventLogger m_writer;
 	};
 }
 
 #endif // SHOGUN_PARAMETEROBSERVERTENSORBOARD_H
+#endif // HAVE_TFLOGGER
diff --git a/src/shogun/lib/config.h.in b/src/shogun/lib/config.h.in
@@ -14,6 +14,7 @@
 #cmakedefine HAVE_LAPACK 1
 #cmakedefine HAVE_MVEC 1
 #cmakedefine HAVE_PROTOBUF 1
+#cmakedefine HAVE_TFLOGGER 1
 
 #cmakedefine HAVE_ARPACK 1
 #cmakedefine HAVE_VIENNACL 1

diff --git a/tests/unit/lib/ParameterObserverScalar_unittest.cc b/tests/unit/lib/ParameterObserverScalar_unittest.cc
@@ -2,10 +2,10 @@
 #include <vector>
 #include <gtest/gtest.h>
 
-using namespace shogun;
-
 std::vector<std::string> test_params = {"a", "b", "c", "d"};
 
+using namespace shogun;
+
 TEST(ParameterObserverScalar, filter_empty)
 {
     ParameterObserverScalar tmp;