bump version; use 1 CPU by default in binder notebooks (much faster)

cmbant · Feb 14, 2020 · c57de86 · c57de86
1 parent f021be3
commit c57de86
Show file tree

Hide file tree

Showing 9 changed files with 3,607 additions and 745 deletions.
diff --git a/README.rst b/README.rst
@@ -70,6 +70,7 @@ To reproduce legacy results, see these branches:
  - *CAMB_sources* is the old public `CAMB Sources <https://camb.info/sources/>`_ code.
  - *CAMB_v0* is the old Fortran-oriented (gfortran 4.8-compatible) version as used by the Planck 2018 analysis.
  - *rayleigh* includes frequency-dependent Rayleigh scattering
+ - *python2* is the last Python 2 compatible version
 
 =============
 

diff --git a/camb/__init__.py b/camb/__init__.py
@@ -7,7 +7,7 @@
 __author__ = "Antony Lewis"
 __contact__ = "antony at cosmologist dot info"
 __url__ = "https://camb.readthedocs.io"
-__version__ = "1.1.0.1"
+__version__ = "1.1.1"
 
 from . import baseconfig
 

diff --git a/camb/_config.py b/camb/_config.py
@@ -1,3 +1,4 @@
+import os
 from .baseconfig import import_property, CAMBError
 from ctypes import c_char, c_int, c_bool, c_double
 
@@ -60,3 +61,6 @@ def __repr__(self):
 
 
 config = _config()
+
+if os.environ.get('BINDER_LAUNCH_HOST'):
+    config.ThreadNum = 1  # binder is very slow with more than 1 CPU, force 1 by default
diff --git a/camb/cambdll.dll b/camb/cambdll.dll