Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ormorod cmake #1

Open
wants to merge 125 commits into
base: cmake-dev
Choose a base branch
from
Open

Ormorod cmake #1

wants to merge 125 commits into from

Conversation

AdamOrmondroyd
Copy link
Owner

No description provided.

williamjameshandley and others added 30 commits March 8, 2022 14:10
@williamjameshandley
General code cleanup
182e021
@Pablo-Lemos
Updated to cray makefile for NERSC compatibility (PolyChord#85)
0a89af0
@williamjameshandley
numpy int64 incompatibility fix (PolyChord#84)
e00386b 
* General code cleanup

* Fix to maddening np.int64 int incompatibility

* Slightly more pythonic conversion
removed cmake modifying setup_cmake_template.py gymnastics
6f2ecc3
removed run_cmake workflow and added macos to CI
e183ec9
removed run_cmake workflow and added macos to CI
48fd7d2
Merge branch 'ormorod-cmake' of github.com:Ormorod/PolyChordLite into…
ee21164 
… ormorod-cmake
added cmake-dev to pull request branches
7268b3c
changed macos workflow to use pip3
4dd1323
removed gcc from matrix
9df751e
manually added cmake fortran compiler
1168bb1
specified python 3.8 for macos
1668aa4
back to just pip
8d6158e
added python setup to macos
b2e6324
changed to brewed python
5124d57
changed to python3 and pip3
8a00e8b
changed to python3 and pip3
73a6180
Merge branch 'ormorod-cmake' of github.com:Ormorod/PolyChordLite into…
911e102 
… ormorod-cmake
readded checkout
b0c97fa
switched to gcc, with additional brew install
bb21b1a
took out fortran compiler from cmake
feda699
specify fortran compiler with environment variable
de74629
echo which gfortran and gcc
4cfab4f
echo which gfortran and gcc
2bed9c4
Merge branch 'ormorod-cmake' of github.com:Ormorod/PolyChordLite into…
0992223 
… ormorod-cmake
removed echo
551535f
removed accidental t
aa74597
added gfortran to brew install
01e6fec
set FC envonment variable in correct place
7085bd5
gfortran -> gfortran-11
7ffa247
Adam Ormondroyd and others added 30 commits June 7, 2022 14:07
removed all but UniformPrior import
7fb8d51
specify numpy 1.21
78acc66
specify numpy 1.21
5719486
Merge branch 'ormorod-cmake' of github.com:Ormorod/PolyChordLite into…
992cd44 
… ormorod-cmake
specity numpy 1.21 in setup
42fe609
requirement numpy 1.21
e917863
numpy 1.21.6
c903fd4
macos-12
f860e63
python 3.9.13
e667733
from scipy.special import erfinv
68fe2c3
copied across run_pypolychord.py up until running
3b4d96c
just import erfinv lol
6c3eeaf
remembered to install scipy
6e04e7d
install polychord again
53fe9e1
import pypolychord
57d43e0
run_pypolychord.py
fba2c02
actually run this time
cf0ab71
added flush
7670737
changed cmake_build_ext to CMakeBuildExt
d78fd7c
changed build_py to build_ext
390745d
back to build_py
2e258e3
Revert "back to build_py"
c5c39fa 
This reverts commit 2e258e3.
Revert "changed build_py to build_ext"
0364713 
This reverts commit 390745d.
Merge branch 'cmake-dev' into ormorod-cmake
7d52dec
Merge branch 'cmake-dev' into ormorod-cmake
144fadf
@AdamOrmondroyd
removed accidental tkinter import
896ab1a
Merge branch 'ormorod-cmake' of github.com:Ormorod/PolyChordLite into…
0978711 
… ormorod-cmake
build_cmake attempt to set compilers properly
717d076
added env to cmake call
3c2fdea
added gfortran to brew install
85acf5a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AdamOrmondroyd @williamjameshandley @Pablo-Lemos