minor bug fixes

README.md

@@ -180,7 +180,7 @@ This will install necessary packages for building the documentation (`sphinx`, `
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags).
 
-Current Version: 1.5.2
+Current Version: 1.5.3
 
 ## Authors/Developers
 

docs/html/README.html

@@ -343,7 +343,7 @@ <h2>Versioning<a class="headerlink" href="#versioning" title="Permalink to this
 <p>We use <a class="reference external" href="http://semver.org/">SemVer</a> for versioning. For the versions
 available, see the <a class="reference external" href="https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags">tags on this
 repository</a>.</p>
-<p>Current Version: 1.5.2</p>
+<p>Current Version: 1.5.3</p>
 </section>
 <section id="authors-developers">
 <h2>Authors/Developers<a class="headerlink" href="#authors-developers" title="Permalink to this heading"></a></h2>

docs/html/_sources/README.rst.txt

@@ -273,7 +273,7 @@ We use `SemVer <http://semver.org/>`__ for versioning. For the versions
 available, see the `tags on this
 repository <https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags>`__.
 
-Current Version: 1.5.2
+Current Version: 1.5.3
 
 Authors/Developers
 ------------------

docs/html/_sources/general/docs_main.rst.txt

@@ -34,6 +34,7 @@ Package TODOs
 Change Log
 ===========
 
+- 1.5.3: openmp removed from change file. Temporary removal of zenodo record dictionary. 
 - 1.5.1: Added FD waveform. Removed an ``exp`` computation. Made module pickeable. Updated install. 
 - 1.4.10: M1 installation and small bug fixes. 
 - 1.4.9: Fixed omp issue. 

docs/html/general/docs_main.html

@@ -132,6 +132,7 @@ <h1>Package TODOs<a class="headerlink" href="#package-todos" title="Permalink to
 <section id="change-log">
 <h1>Change Log<a class="headerlink" href="#change-log" title="Permalink to this heading"></a></h1>
 <ul class="simple">
+<li><p>1.5.3: openmp removed from change file. Temporary removal of zenodo record dictionary.</p></li>
 <li><p>1.5.1: Added FD waveform. Removed an <code class="docutils literal notranslate"><span class="pre">exp</span></code> computation. Made module pickeable. Updated install.</p></li>
 <li><p>1.4.10: M1 installation and small bug fixes.</p></li>
 <li><p>1.4.9: Fixed omp issue.</p></li>

docs/html/index.html

@@ -346,7 +346,7 @@ <h2>Versioning<a class="headerlink" href="#versioning" title="Permalink to this
 <p>We use <a class="reference external" href="http://semver.org/">SemVer</a> for versioning. For the versions
 available, see the <a class="reference external" href="https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags">tags on this
 repository</a>.</p>
-<p>Current Version: 1.5.2</p>
+<p>Current Version: 1.5.3</p>
 </section>
 <section id="authors-developers">
 <h2>Authors/Developers<a class="headerlink" href="#authors-developers" title="Permalink to this heading"></a></h2>

docs/source/README.rst

@@ -273,7 +273,7 @@ We use `SemVer <http://semver.org/>`__ for versioning. For the versions
 available, see the `tags on this
 repository <https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags>`__.
 
-Current Version: 1.5.2
+Current Version: 1.5.3
 
 Authors/Developers
 ------------------

docs/source/general/docs_main.rst

@@ -34,6 +34,7 @@ Package TODOs
 Change Log
 ===========
 
+- 1.5.3: openmp removed from change file. Temporary removal of zenodo record dictionary. 
 - 1.5.1: Added FD waveform. Removed an ``exp`` computation. Made module pickeable. Updated install. 
 - 1.4.10: M1 installation and small bug fixes. 
 - 1.4.9: Fixed omp issue. 

few/utils/utility.py

@@ -712,40 +712,40 @@ def get_mu_at_t(
 
 
 # data history is saved here nased on version nunber
-record_by_version = {
-    "1.0.0": 3981654,
-    "1.1.0": 3981654,
-    "1.1.1": 3981654,
-    "1.1.2": 3981654,
-    "1.1.3": 3981654,
-    "1.1.4": 3981654,
-    "1.1.5": 3981654,
-    "1.2.0": 3981654,
-    "1.2.1": 3981654,
-    "1.2.2": 3981654,
-    "1.3.0": 3981654,
-    "1.3.1": 3981654,
-    "1.3.2": 3981654,
-    "1.3.3": 3981654,
-    "1.3.4": 3981654,
-    "1.3.5": 3981654,
-    "1.3.6": 3981654,
-    "1.3.7": 3981654,
-    "1.4.0": 3981654,
-    "1.4.1": 3981654,
-    "1.4.2": 3981654,
-    "1.4.3": 3981654,
-    "1.4.4": 3981654,
-    "1.4.5": 3981654,
-    "1.4.6": 3981654,
-    "1.4.7": 3981654,
-    "1.4.8": 3981654,
-    "1.4.9": 3981654,
-    "1.4.10": 3981654,
-    "1.4.11": 3981654,
-    "1.5.0": 3981654,
-    "1.5.1": 3981654,
-}
+# record_by_version = {
+#     "1.0.0": 3981654,
+#     "1.1.0": 3981654,
+#     "1.1.1": 3981654,
+#     "1.1.2": 3981654,
+#     "1.1.3": 3981654,
+#     "1.1.4": 3981654,
+#     "1.1.5": 3981654,
+#     "1.2.0": 3981654,
+#     "1.2.1": 3981654,
+#     "1.2.2": 3981654,
+#     "1.3.0": 3981654,
+#     "1.3.1": 3981654,
+#     "1.3.2": 3981654,
+#     "1.3.3": 3981654,
+#     "1.3.4": 3981654,
+#     "1.3.5": 3981654,
+#     "1.3.6": 3981654,
+#     "1.3.7": 3981654,
+#     "1.4.0": 3981654,
+#     "1.4.1": 3981654,
+#     "1.4.2": 3981654,
+#     "1.4.3": 3981654,
+#     "1.4.4": 3981654,
+#     "1.4.5": 3981654,
+#     "1.4.6": 3981654,
+#     "1.4.7": 3981654,
+#     "1.4.8": 3981654,
+#     "1.4.9": 3981654,
+#     "1.4.10": 3981654,
+#     "1.4.11": 3981654,
+#     "1.5.0": 3981654,
+#     "1.5.1": 3981654,
+# }
 
 
 def check_for_file_download(fp, few_dir, version_string=None):
@@ -769,23 +769,23 @@ def check_for_file_download(fp, few_dir, version_string=None):
     """
 
     # make sure version_string is available
-    if version_string is not None:
-        if version_string not in record_by_version:
-            raise ValueError(
-                "The version_string provided ({}) does not exist.".format(
-                    version_string
-                )
-            )
-    else:
-        version_string = few.__version__
-
-    # check if the files directory exists
-    try:
-        os.listdir(few_dir + "few/files/")
-
-    # if not, create it
-    except OSError:
-        os.mkdir(few_dir + "few/files/")
+    # if version_string is not None:
+    #     if version_string not in record_by_version:
+    #         raise ValueError(
+    #             "The version_string provided ({}) does not exist.".format(
+    #                 version_string
+    #             )
+    #         )
+    # else:
+    #     version_string = few.__version__
+
+    # # check if the files directory exists
+    # try:
+    #     os.listdir(few_dir + "few/files/")
+
+    # # if not, create it
+    # except OSError:
+    #     os.mkdir(few_dir + "few/files/")
 
     # check if the file is in the files filder
     # if not, download it from zenodo
@@ -797,7 +797,10 @@ def check_for_file_download(fp, few_dir, version_string=None):
         )
 
         # get record number based on version
-        record = record_by_version.get(version_string)
+        # record = record_by_version.get(version_string)
+
+        # temporary fix
+        record = 3981654
 
         # url to zenodo API
         url = "https://zenodo.org/record/" + str(record) + "/files/" + fp

setup.py

@@ -243,7 +243,7 @@ def build_extensions(self):
         # and not with gcc the implementation of this trick is in
         # customize_compiler()
         extra_compile_args={
-            "gcc": ["-std=c++11", "-fopenmp"],  # '-g'],
+            "gcc": ["-std=c++11"],  # '-g'],
             "nvcc": [
                 "-arch=sm_70",
                 "-gencode=arch=compute_50,code=sm_50",
@@ -294,10 +294,9 @@ def build_extensions(self):
     libraries=["gsl", "gslcblas", "lapack", "lapacke", "hdf5", "hdf5_hl"],
     language="c++",
     runtime_library_dirs=[],
-    extra_compile_args={"gcc": ["-std=c++11", "-fopenmp", "-fPIC"]},  # '-g'
+    extra_compile_args={"gcc": ["-std=c++11"]},  # '-g'
     include_dirs=[numpy_include, "include"],
     library_dirs=None,
-    # library_dirs=["/home/ajchua/lib/"],
 )
 
 if add_lapack: