Merge pull request #149 from astro-informatics/development

Odds and ends
astro-informatics · Oct 14, 2016 · 8a387c5 · 8a387c5
2 parents 0f8686c + da39384
commit 8a387c5
Show file tree

Hide file tree

Showing 48 changed files with 6 additions and 7,114 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,6 @@ option(examples       "Enable Examples"                        on)
 option(logging        "Enable logging"                         on)
 option(regressions    "Enable regressions"                     on)
 option(openmp         "Enable OpenMP"                          on)
-option(archer         "Compiling on ARCHER"                    off)
 
 if(regressions)
   enable_language(C)

diff --git a/cpp/examples/proximal_admm/CMakeLists.txt b/cpp/examples/proximal_admm/CMakeLists.txt
@@ -2,5 +2,5 @@ add_example(padmm_euclidian_norm euclidian_norm.cc LIBRARIES sopt LABELS padmm)
 set_target_properties(example_padmm_euclidian_norm PROPERTIES OUTPUT_NAME euclidian_norm)
 add_example(padmm_inpainting inpainting.cc LIBRARIES sopt tools_for_tests)
 set_target_properties(example_padmm_inpainting PROPERTIES OUTPUT_NAME inpainting)
-add_example(padmm_reweighted reweighted.cc LIBRARIES sopt tools_for_tests)
+add_example(padmm_reweighted NOTEST reweighted.cc LIBRARIES sopt tools_for_tests)
 set_target_properties(example_padmm_reweighted PROPERTIES OUTPUT_NAME reweighted)
diff --git a/cpp/examples/sdmm/CMakeLists.txt b/cpp/examples/sdmm/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_example(euclidian_norm LIBRARIES sopt LABELS sdmm)
 add_example(inpainting LIBRARIES sopt tools_for_tests LABELS sdmm)
-add_example(reweighted LIBRARIES sopt tools_for_tests LABELS sdmm)
+add_example(reweighted NOTEST LIBRARIES sopt tools_for_tests LABELS sdmm)
diff --git a/cpp/sopt/CMakeLists.txt b/cpp/sopt/CMakeLists.txt
@@ -19,7 +19,8 @@ endif()
 add_library(sopt SHARED ${sources})
 add_dependencies(sopt lookup_dependencies)
 set(version "${Sopt_VERSION_MAJOR}.${Sopt_VERSION_MINOR}.${Sopt_VERSION_PATCH}")
-set_target_properties(sopt PROPERTIES VERSION ${version} SOVERSION ${version})
+set(soversion "${Sopt_VERSION_MAJOR}.${Sopt_VERSION_MINOR}")
+set_target_properties(sopt PROPERTIES VERSION ${version} SOVERSION ${soversion})
 
 target_include_directories(sopt PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>

diff --git a/cpp/sopt/logging.enabled.h b/cpp/sopt/logging.enabled.h
@@ -13,7 +13,7 @@ void set_level(std::string const &level, std::string const &name = "");
 //! \brief Initializes a logger.
 //! \details Logger only exists as long as return is kept alive.
 inline std::shared_ptr<spdlog::logger> initialize(std::string const &name = "") {
-  auto const result = spdlog::stdout_logger_mt(default_logger_name() + name, color_logger());
+  auto const result = spdlog::stdout_logger_mt(default_logger_name() + name);
   set_level(default_logging_level(), name);
   return result;
 }

diff --git a/cpp/tests/common_catch_main.cc b/cpp/tests/common_catch_main.cc
@@ -8,7 +8,7 @@
 
 std::unique_ptr<std::mt19937_64> mersenne(new std::mt19937_64(0));
 
-int main(int argc, char const *argv[]) {
+int main(int argc, char *const *argv) {
   Catch::Session session; // There must be exactly once instance
 
   int returnCode = session.applyCommandLine(argc, argv);

diff --git a/matlab/doc/matlab/.svn/all-wcprops b/matlab/doc/matlab/.svn/all-wcprops