Preprocessor flags setting net implementation and enabling perf metrics are now passed via chimbuko_config.h rather than the command line

giltirn · giltirn · commit 056bd885df34 · 2021-07-22T15:09:55.000-04:00
diff --git a/app/hpserver.cpp b/app/hpserver.cpp
@@ -1,4 +1,5 @@
 //The hierarchical parameter server main program. This program collects statistics from the node-instances of the anomaly detector
+#include <chimbuko_config.h>
 #ifndef _USE_ZMQNET
 #include<iostream>
 #warning "Hierarchical parameter server requires ZMQNet"
diff --git a/configure.ac b/configure.ac
@@ -101,11 +101,9 @@ fi
 PS_FLAGS=
 AC_ARG_WITH([network], AS_HELP_STRING([--with-network], [Specify network layer: MPI or ZMQ]),[],[with_network=no])
 if test "x$with_network" = "xMPI"; then
-   #AC_DEFINE([_USE_MPINET],[1],[Use MPI network layer])
-   PS_FLAGS+=" -D_USE_MPINET"
+   AC_DEFINE([_USE_MPINET],[1],[Use MPI network layer])
 elif test "x$with_network" = "xZMQ"; then
-   #AC_DEFINE([_USE_ZMQNET],[1],[Use ZMQ network layer])
-   PS_FLAGS+=" -D_USE_ZMQNET"
+   AC_DEFINE([_USE_ZMQNET],[1],[Use ZMQ network layer])
    AC_CHECK_LIB([zmq], [zmq_close], [],
            [AC_MSG_FAILURE([Could not link to 0MQ])])
 else
@@ -139,8 +137,7 @@ fi
 
 
 #Enable performance metrics dump
-#AC_ARG_WITH([perf-metric], AS_HELP_STRING([--with-perf-metric], [Specify use of performance metrics]),[AC_DEFINE([_PERF_METRIC],[1],[Use performance metrics])],[])
-AC_ARG_WITH([perf-metric], AS_HELP_STRING([--with-perf-metric], [Specify use of performance metrics]),[PS_FLAGS+=" -D_PERF_METRIC"],[])
+AC_ARG_WITH([perf-metric], AS_HELP_STRING([--with-perf-metric], [Specify use of performance metrics]),[AC_DEFINE([_PERF_METRIC],[1],[Use performance metrics])],[])
 
 #Enable ProvdDB margo state dump (currently requires master branch of margo)
 AC_ARG_ENABLE([margo-state-dump],
diff --git a/include/chimbuko/ad/ADAnomalyProvenance.hpp b/include/chimbuko/ad/ADAnomalyProvenance.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <chimbuko/ad/ADEvent.hpp>
 #include <chimbuko/param.hpp>
 #include "chimbuko/ad/ADCounter.hpp"
diff --git a/include/chimbuko/ad/ADCounter.hpp b/include/chimbuko/ad/ADCounter.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include "chimbuko/ad/ADDefine.hpp"
 #include "chimbuko/ad/ExecData.hpp"
 #include "chimbuko/util/map.hpp"
diff --git a/include/chimbuko/ad/ADDefine.hpp b/include/chimbuko/ad/ADDefine.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <climits>
 
 /*! \file ADDefine.hpp
diff --git a/include/chimbuko/ad/ADEvent.hpp b/include/chimbuko/ad/ADEvent.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include "chimbuko/ad/ADDefine.hpp"
 #include "chimbuko/ad/ExecData.hpp"
 #include "chimbuko/ad/ADMetadataParser.hpp"
diff --git a/include/chimbuko/ad/ADLocalCounterStatistics.hpp b/include/chimbuko/ad/ADLocalCounterStatistics.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<unordered_set>
 #include <chimbuko/ad/ADNetClient.hpp>
 #include <chimbuko/ad/ADEvent.hpp>
diff --git a/include/chimbuko/ad/ADLocalFuncStatistics.hpp b/include/chimbuko/ad/ADLocalFuncStatistics.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <chimbuko/ad/ADNetClient.hpp>
 #include <chimbuko/ad/ADEvent.hpp>
 #include <chimbuko/ad/AnomalyData.hpp>
diff --git a/include/chimbuko/ad/ADMetadataParser.hpp b/include/chimbuko/ad/ADMetadataParser.hpp
@@ -1,5 +1,4 @@
 #pragma once
-
 #include<chimbuko_config.h>
 #include<chimbuko/ad/ExecData.hpp>
 #include<unordered_map>
diff --git a/include/chimbuko/ad/ADNetClient.hpp b/include/chimbuko/ad/ADNetClient.hpp
@@ -1,5 +1,4 @@
 #pragma once
-
 #include <chimbuko_config.h>
 #ifdef _USE_MPINET
 #include "chimbuko/net/mpi_net.hpp"
diff --git a/include/chimbuko/ad/ADNormalEventProvenance.hpp b/include/chimbuko/ad/ADNormalEventProvenance.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include<array>
 #include<unordered_set>
 #include<unordered_map>
diff --git a/include/chimbuko/ad/ADOutlier.hpp b/include/chimbuko/ad/ADOutlier.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include<array>
 #include "chimbuko/ad/ADEvent.hpp"
 #include "chimbuko/ad/ExecData.hpp"
diff --git a/include/chimbuko/ad/ADParser.hpp b/include/chimbuko/ad/ADParser.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <mpi.h>
 #include <adios2.h>
 #include <unordered_map>
diff --git a/include/chimbuko/ad/ADglobalFunctionIndexMap.hpp b/include/chimbuko/ad/ADglobalFunctionIndexMap.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <cassert>
 #include <unordered_map>
 #include "ADNetClient.hpp"
diff --git a/include/chimbuko/ad/ADio.hpp b/include/chimbuko/ad/ADio.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include "chimbuko/ad/ADDefine.hpp"
 #include "chimbuko/ad/ADEvent.hpp"
 #include "chimbuko/ad/ADCounter.hpp"
diff --git a/include/chimbuko/ad/AnomalyData.hpp b/include/chimbuko/ad/AnomalyData.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <mutex>
 #include <string>
 #include <iostream>
diff --git a/include/chimbuko/ad/ExecData.hpp b/include/chimbuko/ad/ExecData.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <chimbuko/ad/ADDefine.hpp>
 #include <chimbuko/ad/utils.hpp>
 #include <iostream>
diff --git a/include/chimbuko/ad/utils.hpp b/include/chimbuko/ad/utils.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<functional>
 #include<boost/functional/hash.hpp>
 
diff --git a/include/chimbuko/chimbuko.hpp b/include/chimbuko/chimbuko.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "chimbuko/AD.hpp"
 
 namespace chimbuko {
diff --git a/include/chimbuko/message.hpp b/include/chimbuko/message.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <string>
 #include <iostream>
 #include <nlohmann/json.hpp>
diff --git a/include/chimbuko/net.hpp b/include/chimbuko/net.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include "chimbuko/util/threadPool.hpp"
 #include "chimbuko/message.hpp"
 #include <string>
diff --git a/include/chimbuko/net/local_net.hpp b/include/chimbuko/net/local_net.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <chimbuko/net.hpp>
 #include <chimbuko/util/PerfStats.hpp>
 
diff --git a/include/chimbuko/net/mpi_net.hpp b/include/chimbuko/net/mpi_net.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #ifdef _USE_MPINET
 
 #include "chimbuko/net.hpp"
diff --git a/include/chimbuko/net/zmq_net.hpp b/include/chimbuko/net/zmq_net.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #ifdef _USE_ZMQNET
 
 #include <chimbuko/net.hpp>
diff --git a/include/chimbuko/net/zmqme_net.hpp b/include/chimbuko/net/zmqme_net.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include<chimbuko_config.h>
 #ifdef _USE_ZMQNET
 
 #include <chimbuko/net.hpp>
diff --git a/include/chimbuko/param.hpp b/include/chimbuko/param.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <mutex>
 #include <string>
 #include <iostream>
diff --git a/include/chimbuko/param/hbos_param.hpp b/include/chimbuko/param/hbos_param.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "chimbuko/param.hpp"
 #include "chimbuko/util/RunStats.hpp"
 #include <unordered_map>
diff --git a/include/chimbuko/param/sstd_param.hpp b/include/chimbuko/param/sstd_param.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "chimbuko/param.hpp"
 #include "chimbuko/util/RunStats.hpp"
 #include <unordered_map>
diff --git a/include/chimbuko/pserver.hpp b/include/chimbuko/pserver.hpp
@@ -1,3 +1,4 @@
+#include <chimbuko_config.h>
 #include "pserver/PSstatSender.hpp"
 #include "pserver/global_anomaly_stats.hpp"
 #include "pserver/global_counter_stats.hpp"
diff --git a/include/chimbuko/pserver/AnomalyStat.hpp b/include/chimbuko/pserver/AnomalyStat.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include "chimbuko/ad/AnomalyData.hpp"
 
 namespace chimbuko {
diff --git a/include/chimbuko/pserver/PSglobalFunctionIndexMap.hpp b/include/chimbuko/pserver/PSglobalFunctionIndexMap.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <string>
 #include <iostream>
 #include <unordered_map>
diff --git a/include/chimbuko/pserver/PSstatSender.hpp b/include/chimbuko/pserver/PSstatSender.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <thread>
 #include <atomic>
 #include <nlohmann/json.hpp>
diff --git a/include/chimbuko/pserver/global_anomaly_stats.hpp b/include/chimbuko/pserver/global_anomaly_stats.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <mutex>
 #include <string>
 #include <iostream>
diff --git a/include/chimbuko/pserver/global_counter_stats.hpp b/include/chimbuko/pserver/global_counter_stats.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <mutex>
 #include <string>
 #include <iostream>
diff --git a/include/chimbuko/util/ADIOS2parseUtils.hpp b/include/chimbuko/util/ADIOS2parseUtils.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <mpi.h>
 #include <adios2.h>
 #include <string>
diff --git a/include/chimbuko/util/Anomalies.hpp b/include/chimbuko/util/Anomalies.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "chimbuko/ad/ADEvent.hpp"
 
 namespace chimbuko{
diff --git a/include/chimbuko/util/DispatchQueue.hpp b/include/chimbuko/util/DispatchQueue.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <thread>
 #include <functional>
 #include <string>
diff --git a/include/chimbuko/util/PerfStats.hpp b/include/chimbuko/util/PerfStats.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #ifdef _PERF_METRIC
 #include <chrono>
 #include <sstream>
diff --git a/include/chimbuko/util/RunMetric.hpp b/include/chimbuko/util/RunMetric.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <fstream>
 #include <nlohmann/json.hpp>
 #include "chimbuko/util/RunStats.hpp"
diff --git a/include/chimbuko/util/RunStats.hpp b/include/chimbuko/util/RunStats.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <iostream>
 #include <vector>
 #include <limits>
diff --git a/include/chimbuko/util/barrier.hpp b/include/chimbuko/util/barrier.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<thread>
 #include <condition_variable>
 #include <mutex>
diff --git a/include/chimbuko/util/commandLineParser.hpp b/include/chimbuko/util/commandLineParser.hpp
@@ -1,5 +1,6 @@
 /** @file */
 #pragma once
+#include <chimbuko_config.h>
 #include<iostream>
 #include<vector>
 #include<memory>
diff --git a/include/chimbuko/util/error.hpp b/include/chimbuko/util/error.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <iostream>
 #include <mutex>
 
diff --git a/include/chimbuko/util/hash.hpp b/include/chimbuko/util/hash.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<array>
 #include<boost/functional/hash.hpp>
 
diff --git a/include/chimbuko/util/map.hpp b/include/chimbuko/util/map.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<unordered_map>
 
 namespace chimbuko{
diff --git a/include/chimbuko/util/memutils.hpp b/include/chimbuko/util/memutils.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <cstddef>
 
 namespace chimbuko{
diff --git a/include/chimbuko/util/mtQueue.hpp b/include/chimbuko/util/mtQueue.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
diff --git a/include/chimbuko/util/serialize.hpp b/include/chimbuko/util/serialize.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <cereal/archives/portable_binary.hpp>
 #include <cereal/types/vector.hpp>
 #include <cereal/types/string.hpp>
diff --git a/include/chimbuko/util/string.hpp b/include/chimbuko/util/string.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include <sstream>
 #include <vector>
 #include <cstdarg>
diff --git a/include/chimbuko/util/threadPool.hpp b/include/chimbuko/util/threadPool.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "chimbuko/util/mtQueue.hpp"
 
 #include <algorithm>
diff --git a/include/chimbuko/util/time.hpp b/include/chimbuko/util/time.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <chimbuko_config.h>
 #include <string>
 
 namespace chimbuko{
diff --git a/include/chimbuko/verbose.hpp b/include/chimbuko/verbose.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<chimbuko/util/time.hpp>
 #include<iostream>
 
diff --git a/sim/include/sim.hpp b/sim/include/sim.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include "sim/provdb.hpp"
 #include "sim/id_map.hpp"
 #include "sim/ad_params.hpp"
diff --git a/sim/include/sim/ad.hpp b/sim/include/sim/ad.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<chimbuko/ad/ADProvenanceDBclient.hpp>
 #include<chimbuko/ad/ADMetadataParser.hpp>
 #include<chimbuko/ad/ADNormalEventProvenance.hpp>
diff --git a/sim/include/sim/ad_params.hpp b/sim/include/sim/ad_params.hpp
@@ -1,3 +1,4 @@
+#include <chimbuko_config.h>
 #include<chimbuko/param/sstd_param.hpp>
 #include<chimbuko/ad/ADOutlier.hpp>
 #include "id_map.hpp"
diff --git a/sim/include/sim/event_id_map.hpp b/sim/include/sim/event_id_map.hpp
@@ -1,3 +1,4 @@
+#include <chimbuko_config.h>
 #include<chimbuko/ad/ADEvent.hpp>
 
 namespace chimbuko_sim{
diff --git a/sim/include/sim/id_map.hpp b/sim/include/sim/id_map.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<string>
 #include<unordered_map>
 
diff --git a/sim/include/sim/provdb.hpp b/sim/include/sim/provdb.hpp
@@ -1,3 +1,4 @@
+#include <chimbuko_config.h>
 #include <sonata/Admin.hpp>
 #include <sonata/Provider.hpp>
 #include<chimbuko/ad/ADProvenanceDBclient.hpp>
diff --git a/sim/include/sim/pserver.hpp b/sim/include/sim/pserver.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <chimbuko_config.h>
 #include<chimbuko/param.hpp>
 #include<chimbuko/pserver/global_anomaly_stats.hpp>
 #include<chimbuko/pserver/global_counter_stats.hpp>
diff --git a/sim/include/sim/thread_execution_api.hpp b/sim/include/sim/thread_execution_api.hpp
diff --git a/src/net/mpi_net.cpp b/src/net/mpi_net.cpp
diff --git a/src/net/zmq_net.cpp b/src/net/zmq_net.cpp
diff --git a/src/net/zmqme_net.cpp b/src/net/zmqme_net.cpp
diff --git a/test/unit_tests/unit_test_common.hpp b/test/unit_tests/unit_test_common.hpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//The hierarchical parameter server main program. This program collects statistics from the node-instances of the anomaly detector`
	`2`	`+#include <chimbuko_config.h>`
`2`	`3`	`#ifndef _USE_ZMQNET`
`3`	`4`	`#include<iostream>`
`4`	`5`	`#warning "Hierarchical parameter server requires ZMQNet"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#pragma once`
	`2`	`+#include <chimbuko_config.h>`
`2`	`3`	`#include "chimbuko/ad/ADDefine.hpp"`
`3`	`4`	`#include "chimbuko/ad/ExecData.hpp"`
`4`	`5`	`#include "chimbuko/util/map.hpp"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-`
`3`	`2`	`#include<chimbuko_config.h>`
`4`	`3`	`#include<chimbuko/ad/ExecData.hpp>`
`5`	`4`	`#include<unordered_map>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-`
`3`	`2`	`#include <chimbuko_config.h>`
`4`	`3`	`#ifdef _USE_MPINET`
`5`	`4`	`#include "chimbuko/net/mpi_net.hpp"`