Merge branch 'ankith26-gsoc' of https://github.com/ankith26/PyElastica …

…into ankith26-gsoc

backend/buildscripts/build-all.sh

@@ -67,4 +67,16 @@ if [ ! -d sleef ]; then
     cd ..
 fi
 
+# brigand
+if [ ! -d brigand ]; then
+    git clone --depth 1 https://github.com/edouarda/brigand.git && cd brigand
+
+    mkdir build
+    cmake -B build $ELASTICA_BASE_CMAKE_FLAGS \
+        -S .
+    cmake --build build --parallel $(nproc)
+    cmake --install build
+    cd ..
+fi
+
 cd $OLD_CWD

backend/meson.build

@@ -59,6 +59,9 @@ pybind11_dep = declare_dependency(
     ).stdout().strip(),
 )
 
+# python and pybind deps are used together
+py_deps = [py_dep, pybind11_dep]
+
 fs = import('fs')
 
 message('Running buildscripts/build-all.sh (might take a while)')
@@ -93,7 +96,11 @@ endif
 # blaze and deps commonly used together
 blaze_deps = [blaze_dep, blaze_tensor_dep, sleef_dep]
 
-brigand_dep = dependency('brigand', fallback : 'brigand')
+brigand_dep = dependency('brigand', required: false)
+if not brigand_dep.found()
+    brigand_dep = declare_dependency(include_directories: deps_inc_dirs)
+endif
+
 cxxopts_dep = dependency('cxxopts', fallback : 'cxxopts')
 
 # meson-python: error: Could not map installation path to an equivalent wheel directory:

backend/src/Utilities/StaticConst.hpp

@@ -0,0 +1,70 @@
+//==============================================================================
+/*!
+//  \file
+//  \brief Create a static constant that avoids ODR violations
+//
+//  Copyright (C) 2020-2020 Tejaswin Parthasarathy - All Rights Reserved
+//  Copyright (C) 2020-2020 MattiaLab - All Rights Reserved
+//
+//  Distributed under the MIT License.
+//  See LICENSE.txt for details.
+//
+//  This was taken from the Range v3 library with the following copyrights
+**  Copyright Eric Niebler 2013-present
+**
+**  Use, modification and distribution is subject to the
+**  Boost Software License, Version 1.0. (See accompanying
+**  file LICENSE_1_0.txt or copy at
+**  http://www.boost.org/LICENSE_1_0.txt)
+**
+**  Project home: https://github.com/ericniebler/range-v3
+**
+*/
+//==============================================================================
+
+#pragma once
+
+namespace elastica {
+
+  //============================================================================
+  //
+  //  CLASS DEFINITION
+  //
+  //============================================================================
+
+  //****************************************************************************
+  /*!\brief Holds a static compile-time constant
+  // \ingroup utils
+  //
+  // static_const is a helper to create and hold a static compile-time constant
+  //
+  // \usage
+     \code
+       // create a default initialized integer
+       constexpr auto zero = elastica::static_const<int>::value;
+     \endcode
+  //
+  // \example
+  // \snippet Test_StaticConst.cpp static_const_example
+  //
+  // \tparam T Type of static constant to create
+  */
+  template <typename T>
+  struct static_const {
+    static constexpr T value{};
+  };
+  //****************************************************************************
+
+  //****************************************************************************
+  /*!\brief Variable template storage for a static compile-time constant
+  // \ingroup utils
+  //
+  // \tparam T Type of static constant to create
+  //
+  // \see static_const
+  */
+  template <typename T>
+  constexpr T static_const<T>::value;
+  //****************************************************************************
+
+}  // namespace elastica

backend/src/meson.build

@@ -1,7 +1,7 @@
 example_1 = py.extension_module(
     'example_1',
     sources: ['example_1.cpp'],
-    dependencies: [py_dep, pybind11_dep],
+    dependencies: py_deps,
     link_language: 'cpp',
     install: true,
     subdir: package,
@@ -10,7 +10,7 @@ example_1 = py.extension_module(
 _linalg = py.extension_module(
     '_linalg',
     sources: ['_linalg.cpp'],
-    dependencies: [py_dep, pybind11_dep] + blaze_deps,
+    dependencies: py_deps + blaze_deps,
     link_language: 'cpp',
     install: true,
     subdir: package,
@@ -19,7 +19,7 @@ _linalg = py.extension_module(
 _linalg_numpy = py.extension_module(
     '_linalg_numpy',
     sources: ['_linalg_numpy.cpp'],
-    dependencies: [py_dep, pybind11_dep] + blaze_deps,
+    dependencies: py_deps + blaze_deps,
     link_language: 'cpp',
     install: true,
     subdir: package,
@@ -33,7 +33,7 @@ _PyArrays = py.extension_module(
         'Utilities/Math/Python/BlazeMatrix.cpp',
         'Utilities/Math/Python/BlazeTensor.cpp',
     ],
-    dependencies: [py_dep, pybind11_dep] + blaze_deps,
+    dependencies: py_deps + blaze_deps,
     link_language: 'cpp',
     install: true,
     subdir: package,
@@ -45,7 +45,7 @@ _PyTags = py.extension_module(
         'Systems/Python/Bindings.cpp',
         'Systems/Python/BindTags.cpp',
     ],
-    dependencies: [py_dep, pybind11_dep] + blaze_deps,
+    dependencies: py_deps + blaze_deps + brigand_dep,
     link_language: 'cpp',
     install: true,
     subdir: package,