Removed calls to shared_from_this from DipoleSource, this allows for pybind11 wrapping and should improve performance

Modules/FDEM1D/include/DipoleSource.h

@@ -41,9 +41,10 @@ namespace Lemma {
     /// \details  More complex sources are constructed from a superposition of
     ///           dipoles.
     // ==========================================================================
-    //class DipoleSource : public std::enable_shared_from_this<DipoleSource>,  LemmaObject {
-    class DipoleSource : public LemmaObject, std::enable_shared_from_this<DipoleSource> {
-    //class DipoleSource : public LemmaObject, private std::enable_shared_from_this<DipoleSource> {
+    // pybind11 struggles with deriving from enable_shared_from_this,
+    //          instead we revert to raw pointers inside Lemma which also boosts performance
+    //class DipoleSource : public LemmaObject, std::enable_shared_from_this<DipoleSource> {
+    class DipoleSource : public LemmaObject {
 
         // ====================    FRIENDS     ======================
 

Modules/FDEM1D/python/pyFDEM1D.cpp

@@ -88,17 +88,17 @@ PYBIND11_MODULE(FDEM1D, m) {
 
     ;
 
-    //py::class_<Lemma::DipoleSource, std::shared_ptr<Lemma::DipoleSource> > DipoleSource(m, "DipoleSource");
+    py::class_<Lemma::DipoleSource, std::shared_ptr<Lemma::DipoleSource> > DipoleSource(m, "DipoleSource");
 
         // lifecycle
-        //DipoleSource.def(py::init(&Lemma::DipoleSource::NewSP))
+        DipoleSource.def(py::init(&Lemma::DipoleSource::NewSP))
         //.def_static("DeSerialize", py::overload_cast<const std::string&>(&Lemma::DipoleSource::DeSerialize), "Construct object from yaml representation")
 
         // print
-        //.def("Serialize", &Lemma::DipoleSource::Print, "YAML representation of the class")
-        //.def("__repr__", &Lemma::DipoleSource::Print)
+        .def("Serialize", &Lemma::DipoleSource::Print, "YAML representation of the class")
+        .def("__repr__", &Lemma::DipoleSource::Print)
 
-        //;
+        ;
 }
 
 

Modules/FDEM1D/src/DipoleSource.cpp

@@ -276,9 +276,11 @@ namespace Lemma {
         layr = Earth->GetLayerAtThisDepth(Receivers->GetLocation(irec)[2]);
 
         KernelManager = KernelEM1DManager::NewSP();
+
             KernelManager->SetEarth(Earth);
             // alternative is to use weak_ptr here, this is deep and internal, and we are safe.
-            KernelManager->SetDipoleSource( shared_from_this().get() , ifreq, Receivers->GetLocation(irec)[2]);
+            //KernelManager->SetDipoleSource( shared_from_this().get() , ifreq, Receivers->GetLocation(irec)[2]);
+            KernelManager->SetDipoleSource( this, ifreq, Receivers->GetLocation(irec)[2]);
 
             //KernelManager->SetDipoleSource( this.get() , ifreq, Receivers->GetLocation(irec)[2] );
             kernelFreq = Freqs(ifreq); // this is never used

python/build_wheels.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e -x
+
+export PYHOME=/home
+cd ${PYHOME}
+
+/opt/python/cp37-cp37m/bin/pip install twine cmake
+ln -s /opt/python/cp37-cp37m/bin/cmake /usr/bin/cmake
+
+# Compile wheels
+for PYBIN in /opt/python/cp3*/bin; do
+    "${PYBIN}/pip" wheel /io/ -w wheelhouse/
+    "${PYBIN}/python" /io/setup.py sdist -d /io/wheelhouse/
+done
+
+# Bundle external shared libraries into the wheels
+for whl in wheelhouse/*.whl; do
+    auditwheel repair "$whl" -w /io/wheelhouse/
+done
+
+# Test
+for PYBIN in /opt/python/cp3*/bin/; do
+    "${PYBIN}/pip" install -r /io/requirements-test.txt
+    "${PYBIN}/pip" install --no-index -f /io/wheelhouse nb-cpp
+    (cd "$PYHOME"; "${PYBIN}/pytest" /io/test/)
+done
+
+#  Upload
+for WHEEL in /io/wheelhouse/nb_cpp*; do
+    # dev
+    # /opt/python/cp37-cp37m/bin/twine upload \
+    #     --skip-existing \
+    #     --repository-url https://test.pypi.org/legacy/ \
+    #     -u "${TWINE_USERNAME}" -p "${TWINE_PASSWORD}" \
+    #     "${WHEEL}"
+    # prod
+    /opt/python/cp37-cp37m/bin/twine upload \
+        --skip-existing \
+        -u "${TWINE_USERNAME}" -p "${TWINE_PASSWORD}" \
+        "${WHEEL}"
+done

python/publish.sh

@@ -0,0 +1,5 @@
+rm -rf dist
+python setup.py build
+python setup.py bdist_wheel
+auditwheel repair --plat manylinux2010_x86_64  pyLemma-0.0.2-cp37-cp37m-linux_x86_64.whl
+twine upload dist/*