Pulled in changes from develop

manodeep · Sep 5, 2016 · 83ae81b · 83ae81b
2 parents f1d3ede + 2d03952
commit 83ae81b
Show file tree

Hide file tree

Showing 174 changed files with 19,792 additions and 10,037 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@ zz*
 *dSYM*
 .DS_Store
 *.pyc
+*_float.[ch]
+*_double.[ch]
 DD
 build*
 dist*

diff --git a/.travis.yml b/.travis.yml
@@ -30,48 +30,47 @@ matrix:
   include:
     #### osx with clang doesn't use openmp -> so they are the slowest. Run them first
     # - os: osx
-    #   osx_image: xcode8
     #   compiler: gcc
     #   env: COMPILER=gcc-4.9 FAMILY=gcc V='4.9' PYTHON_VERSION=2.6 NUMPY_VERSION=1.7 
     #   before_install:
-    #     # - brew update
-    #     # - brew tap homebrew/versions && brew reinstall gcc49 --without-multilib
+    #     - brew update
+    #     - brew tap homebrew/versions && brew reinstall gcc49 --without-multilib
     #     - wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh
     #     - bash miniconda.sh -b -p $HOME/miniconda
     #     - export PATH="$HOME/miniconda/bin:$PATH"
     #     - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
     #     - source activate test
     #     - conda install -q --yes -c asmeurer gsl
 
+
     # - os: osx
-    #   osx_image: beta-xcode6.2
-    #   compiler: gcc
-    #   env: COMPILER=gcc-4.9 FAMILY=gcc V='4.9' PYTHON_VERSION=2.6 NUMPY_VERSION=1.7 
+    #   compiler: clang
+    #   env: COMPILER=clang-omp FAMILY=clang V='3.5' PYTHON_VERSION=2.7
     #   before_install:
     #     - brew update
-    #     - brew tap homebrew/versions && brew reinstall gcc49 --without-multilib
+    #     - brew outdated xctool || brew upgrade xctool
+    #     - brew tap homebrew/versions && brew install clang-omp
     #     - wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh
     #     - bash miniconda.sh -b -p $HOME/miniconda
     #     - export PATH="$HOME/miniconda/bin:$PATH"
     #     - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
     #     - source activate test
-    #     - conda install -q --yes -c asmeurer gsl
+    #     - conda install -q --yes -c asmeurer gsl        
 
-   # - os: osx
-   #   compiler: clang
-   #   env: COMPILER=clang-omp FAMILY=clang V='3.5' PYTHON_VERSION=2.7
-   #   before_install:
-   #     - brew update
-   #     - brew outdated xctool || brew upgrade xctool
-   #     - brew tap homebrew/versions && brew install clang-omp
-   #     - wget http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh
-   #     - bash miniconda.sh -b -p $HOME/miniconda
-   #     - export PATH="$HOME/miniconda/bin:$PATH"
-   #     - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
-   #     - source activate test
-   #     - conda install -q --yes -c asmeurer gsl        
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+      env: COMPILER=clang FAMILY=clang V='Apple LLVM 7.0.0' PYTHON_VERSION=3.5
+      before_install:
+        - wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+        - bash miniconda.sh -b -p $HOME/miniconda
+        - export PATH="$HOME/miniconda/bin:$PATH"
+        - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
+        - source activate test
+        - conda install -q --yes -c asmeurer gsl
 
     - os: osx
+      osx_image: xcode7.3
       compiler: clang
       env: COMPILER=clang FAMILY=clang V='Apple LLVM 7.0.0' PYTHON_VERSION=3.5
       before_install:
@@ -82,6 +81,33 @@ matrix:
         - source activate test
         - conda install -q --yes -c asmeurer gsl
 
+
+    - os: osx
+      osx_image: xcode7
+      compiler: clang
+      env: COMPILER=clang FAMILY=clang V='Apple LLVM 7.0.0' PYTHON_VERSION=3.5
+      before_install:
+        - wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+        - bash miniconda.sh -b -p $HOME/miniconda
+        - export PATH="$HOME/miniconda/bin:$PATH"
+        - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
+        - source activate test
+        - conda install -q --yes -c asmeurer gsl
+
+
+    - os: osx
+      osx_image: xcode6.4
+      compiler: clang
+      env: COMPILER=clang FAMILY=clang V='Apple LLVM 7.0.0' PYTHON_VERSION=3.5
+      before_install:
+        - wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+        - bash miniconda.sh -b -p $HOME/miniconda
+        - export PATH="$HOME/miniconda/bin:$PATH"
+        - conda create -q --yes -n test python=$PYTHON_VERSION numpy=$NUMPY_VERSION
+        - source activate test
+        - conda install -q --yes -c asmeurer gsl
+
+
     # - os: osx
     #   compiler: gcc
     #   env: COMPILER=gcc-4.8 V='4.8' PYTHON_VERSION=3.5 FAMILY=gcc
@@ -100,7 +126,7 @@ matrix:
     #   compiler: clang
     #   addons:
     #     apt: 
-    #       sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
+    #       sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.6']
     #       packages: ['clang-3.6','libgsl0-dev']
     #   env: COMPILER=clang-3.6 V=3.6 PYTHON_VERSION=2.7 
     #   before_install:
@@ -116,7 +142,7 @@ matrix:
     #   compiler: clang
     #   addons:
     #     apt: 
-    #       sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
+    #       sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.6']
     #       packages: ['clang-3.6','libgsl0-dev']
     #   env: COMPILER=clang-3.6 V=3.6 PYTHON_VERSION=3.5
     #   before_install:
@@ -176,7 +202,7 @@ matrix:
 
 
 install:
-  - make CC=$COMPILER
+  - make -r CC=$COMPILER
   - make install CC=$COMPILER
   - python setup.py install
 

diff --git a/Corrfunc/__init__.py b/Corrfunc/__init__.py
@@ -6,7 +6,7 @@
 import sys
 import os
 
-__all__ = ["_countpairs", "_countpairs_mocks", "utils"]
+__all__ = ["_countpairs", "_countpairs_mocks", "utils", "theory", "mocks"]
 
 # from Corrfunc import * throws: TypeError: Item in ``from list'' not a string
 # following the accepted answer in:
@@ -15,7 +15,7 @@
 if sys.version_info[0] < 3:
     __all__ = [n.encode('ascii') for n in __all__]
 
-__version__ = "1.2.0"
+__version__ = "1.9.0"
 
 
 def read_text_file(filename, encoding="utf-8"):