Merge branch 'develop'

* develop: (93 commits) Update helics.py Update Python swig files Update MATLAB swig files update version string in a few spots fix a few more warnings add configuration documentation restore removed std::string_literals fix some more travis warnings and errors Add barriers to synchronize shutdown move folder to new name and last fix with ValueFederateTests2.cpp remove test from travis for now Remove conditional for MpiCore tests in favor of CMake conditional Add method to disable HELICS creating a thread for MPI calls Add flag if HELICS initialized MPI -- only finalize MPI if we did, otherwise we might mess up application doing its own MPI stuff Create separate method to drain remaining MPI messages during shutdown Specify source and tag for receive calls instead of MPI_ANY_* Add broker_rank and broker_tag options to MPI core fixed a few remaining issues and now exits properly. Fix #169 few more test fixes, still a few more togo start on merging C-test branches, fix a few memory corruption issues, rename test executable ...
GMLC-TDC · Feb 24, 2018 · 1963185 · 1963185
2 parents 1de4532 + 37ea122
commit 1963185
Show file tree

Hide file tree

Showing 489 changed files with 20,982 additions and 8,618 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -109,13 +109,13 @@ CheckOptions:
   - key:             readability-function-size.StatementThreshold
     value:           '800'
   - key:             readability-identifier-naming.AbstractClassCase
-    value:           aNy_CasE
+    value:           CamelCase
   - key:             readability-identifier-naming.AbstractClassPrefix
     value:           ''
   - key:             readability-identifier-naming.AbstractClassSuffix
     value:           ''
   - key:             readability-identifier-naming.ClassCase
-    value:           aNy_CasE
+    value:           CamelCase
   - key:             readability-identifier-naming.ClassConstantCase
     value:           aNy_CasE
   - key:             readability-identifier-naming.ClassConstantPrefix
@@ -129,7 +129,7 @@ CheckOptions:
   - key:             readability-identifier-naming.ClassMemberSuffix
     value:           ''
   - key:             readability-identifier-naming.ClassMethodCase
-    value:           aNy_CasE
+    value:           camelBack
   - key:             readability-identifier-naming.ClassMethodPrefix
     value:           ''
   - key:             readability-identifier-naming.ClassMethodSuffix
@@ -175,9 +175,9 @@ CheckOptions:
   - key:             readability-identifier-naming.ConstexprVariableSuffix
     value:           ''
   - key:             readability-identifier-naming.EnumCase
-    value:           aNy_CasE
+    value:           lower_case
   - key:             readability-identifier-naming.EnumConstantCase
-    value:           aNy_CasE
+    value:           lower_case
   - key:             readability-identifier-naming.EnumConstantPrefix
     value:           ''
   - key:             readability-identifier-naming.EnumConstantSuffix
@@ -187,7 +187,7 @@ CheckOptions:
   - key:             readability-identifier-naming.EnumSuffix
     value:           ''
   - key:             readability-identifier-naming.FunctionCase
-    value:           aNy_CasE
+    value:           camelBack
   - key:             readability-identifier-naming.FunctionPrefix
     value:           ''
   - key:             readability-identifier-naming.FunctionSuffix
@@ -243,7 +243,7 @@ CheckOptions:
   - key:             readability-identifier-naming.MethodSuffix
     value:           ''
   - key:             readability-identifier-naming.NamespaceCase
-    value:           aNy_CasE
+    value:           lowercase
   - key:             readability-identifier-naming.NamespacePrefix
     value:           ''
   - key:             readability-identifier-naming.NamespaceSuffix

diff --git a/.codacy.yml b/.codacy.yml
@@ -12,4 +12,8 @@ languages:
 
 exclude_paths:
   - ThirdParty/**/*
-  - config/cmake/test_compiler_cxx/**
+  - ThirdParty/*
+  - config/cmake/test_compiler_cxx/**
+  - swig/**/*
+  - scripts/**/*
+  - src/helics/common/cppzmq/*
diff --git a/.travis.yml b/.travis.yml
@@ -69,7 +69,7 @@ jobs:
             - ubuntu-toolchain-r-test
           packages:
             - g++-6
-      env: MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so"
+      env: MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so && USE_SWIG=true"
 
     - <<: *linux_base
       addons:
@@ -79,7 +79,7 @@ jobs:
           packages:
             - g++-4.9
       env:
-        - MATRIX_EVAL="COMPILER=g++-4.9 && CC=gcc-4.9 && CXX=g++-4.9 && SHARED_LIB_EXT=so"
+        - MATRIX_EVAL="COMPILER=g++-4.9 && CC=gcc-4.9 && CXX=g++-4.9 && SHARED_LIB_EXT=so && USE_SWIG=false"
         - MINIMUM_DEPENDENCIES=true
 
     - <<: *linux_base
@@ -91,19 +91,19 @@ jobs:
             - llvm-toolchain-precise-3.6
           packages:
             - clang-3.6
-      env: MATRIX_EVAL="SHARED_LIB_EXT=so && COMPILER=clang++-3.6 && CC='ccache clang-3.6 -Qunused-arguments -fcolor-diagnostics' && CXX='ccache clang++-3.6 -Qunused-arguments -fcolor-diagnostics'
+      env: MATRIX_EVAL="SHARED_LIB_EXT=so && USE_SWIG=true && COMPILER=clang++-3.6 && CC='ccache clang-3.6 -Qunused-arguments -fcolor-diagnostics' && CXX='ccache clang++-3.6 -Qunused-arguments -fcolor-diagnostics'
 
 
    # ------------------------------------------------
    # Jobs for daily valgrind and code coverage tests
    # ------------------------------------------------
     - <<: *daily_linux
       env:
-        - MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so"
+        - MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so && USE_SWIG=true"
         - RUN_VALGRIND=true
     - <<: *daily_linux
       env:
-        - MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so"
+        - MATRIX_EVAL="COMPILER=g++-6 && CC=gcc-6 && CXX=g++-6 && SHARED_LIB_EXT=so && USE_SWIG=true"
         - RUN_COVERAGE=true
 
 branches:
@@ -121,19 +121,26 @@ script:
   - mkdir build && cd build
   - export HELICS_DEPENDENCY_FLAGS="-DZeroMQ_INSTALL_PATH=${TRAVIS_BUILD_DIR}/dependencies/zmq -DBOOST_ROOT=${TRAVIS_BUILD_DIR}/dependencies/boost"
   - export HELICS_OPTION_FLAGS="-DBUILD_C_SHARED_LIB=ON -DBUILD_HELICS_EXAMPLES=ON -DBUILD_PYTHON=ON -DTRAVIS_TESTS_ENABLE=ON -DEXAMPLES_WARNINGS_AS_ERROR=ON -DPYTHON_LIBRARY=$(python3-config --prefix)/lib/libpython3.6m.${SHARED_LIB_EXT} -DPYTHON_INCLUDE_DIR=$(python3-config --prefix)/include/python3.6m/"
+  - if [[ "$USE_SWIG" == 'false' ]] ; then HELICS_OPTION_FLAGS+=" -DGENERATE_PYTHON=OFF" ; fi
+    # - echo "$HELICS_OPTION_FLAGS"
+    # - echo "$HELICS_DEPENDENCY_FLAGS"
   - cmake .. ${HELICS_DEPENDENCY_FLAGS} ${HELICS_OPTION_FLAGS}
   - make -j2
   # For controlling which tests get run:
   # ctest -I <start>,<end>,<stride>,<list of test numbers>
   # 1 = common_tests
   # 2 = core tests
   # 3 = application api tests
-  # 4 = c interface tests
+  # 4 = shared_library tests
   # 5 = helics-apps tests
   # 6 = travis-tests
-  # - ctest --verbose --timeout 120 -I 0,0,0,1
+  - ctest --verbose --timeout 120 -I 0,0,0,1
+  # - ctest --verbose --timeout 120 -I 0,0,0,2
   - ctest --verbose --timeout 120 -I 0,0,0,6
+  # - ctest --verbose --timeout 360 -I 0,0,0,4
   - export PYTHONPATH="$(pwd)/swig/python"
+    # - echo "$LD_LIBRARY_PATH"
+    # - echo "$DYLD_FALLBACK_LIBRARY_PATH"
   - python3 -m helics
   - python3 -m pytest -v ../tests/python_helics
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,8 +7,9 @@ project (HELICS)
 set (HELICS_VERSION_MAJOR 1)
 set (HELICS_VERSION_MINOR 0)
 set (HELICS_VERSION_PATCH 0)
-set (HELICS_VERSION_BUILD alpha2)
-set (HELICS_DATE "02-02-18")
+set (HELICS_VERSION_BUILD beta)
+set (HELICS_DATE "02-23-18")
+set (HELICS_VERSION_STRING "1.0.0-beta (02-23-18)")
 
 OPTION(BUILD_HELICS_TESTS "Enable the test Executables to be built" ON)
 # enable testing
@@ -112,10 +113,9 @@ ELSE(UNIX)
   ENDIF(MINGW)
 ENDIF(UNIX)
 
-IF (BUILD_MATLAB OR USE_BOOST_STATIC_LIBS)
+IF (USE_BOOST_STATIC_LIBS)
   set(Boost_USE_STATIC_LIBS ON)
   set(BOOST_STATIC ON)
-
 ENDIF ()
 # -------------------------------------------------------------
 # add coverage target
@@ -188,7 +188,6 @@ endif(ZeroMQ_ENABLE)
 OPTION(MPI_ENABLE "Enable MPI networking library" OFF)
 IF (MPI_ENABLE)
 find_package(MPI)
-set(MPI_C_FOUND FALSE)
 if (${MPI_C_FOUND})
    set(HELICS_HAVE_MPI TRUE)
    include_directories("${MPI_C_INCLUDE_PATH}")
@@ -206,7 +205,7 @@ add_library(helics-static STATIC
     $<TARGET_OBJECTS:helics_core>
     $<TARGET_OBJECTS:helics_common>
 )
-target_link_libraries(helics-static Threads::Threads) 
+target_link_libraries(helics-static Threads::Threads)
 IF (UNIX AND NOT APPLE)
 target_link_libraries(helics-static rt)
 ENDIF()
@@ -380,6 +379,7 @@ endif(ENABLE_CLANG_TOOLS)
 
 add_subdirectory(swig)
 
+add_subdirectory(docs)
 
 set(HELICS_CMAKECONFIG_INSTALL_DIR "cmake/${PROJECT_NAME}" CACHE STRING "install path for HELICSConfig.cmake")
 
@@ -460,3 +460,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
 			   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Import.cmake
               DESTINATION ${HELICS_CMAKECONFIG_INSTALL_DIR})
+
+if (CMAKE_INSTALL_PREFIX)
+    message(STATUS "Using CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
+endif()
+
+
+
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
-# HELICS-SRC [![Build Status](https://travis-ci.org/GMLC-TDC/HELICS-src.svg?branch=master)](https://travis-ci.org/GMLC-TDC/HELICS-src) [![Build status](https://ci.appveyor.com/api/projects/status/afpa4mv0kgsjwvtn/branch/develop?svg=true)](https://ci.appveyor.com/project/nightlark/helics-src/branch/develop) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/83ba19b36b714c729ec3a3d18504505e)](https://www.codacy.com/app/phlptp/HELICS-src?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=GMLC-TDC/HELICS-src&amp;utm_campaign=Badge_Grade) [![Gitter chat](https://badges.gitter.im/GMLC-TDC/HELICS-src.png)](https://gitter.im/GMLC-TDC/HELICS-src) [![Documentation](https://img.shields.io/badge/docs-ready-blue.svg)](http://gmlc-tdc.github.io/HELICS-src)
+# HELICS-SRC [![Build Status](https://travis-ci.org/GMLC-TDC/HELICS-src.svg?branch=master)](https://travis-ci.org/GMLC-TDC/HELICS-src)
+[![Build status](https://ci.appveyor.com/api/projects/status/afpa4mv0kgsjwvtn/branch/develop?svg=true)](https://ci.appveyor.com/project/nightlark/helics-src/branch/develop)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/83ba19b36b714c729ec3a3d18504505e)](https://www.codacy.com/app/phlptp/HELICS-src?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=GMLC-TDC/HELICS-src&amp;utm_campaign=Badge_Grade)
+[![Gitter chat](https://badges.gitter.im/GMLC-TDC/HELICS-src.png)](https://gitter.im/GMLC-TDC/HELICS-src)
+[![Documentation](https://img.shields.io/badge/docs-ready-blue.svg)](http://gmlc-tdc.github.io/HELICS-src)
 
 <p align="center">
 <img src="docs/img/HELICS_Logo.png" width="400">