Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5c19005
first cut simplifying python build
timkpaine Jul 10, 2020
1d7a2fc
build inplace and choco install tbb
timkpaine Jul 10, 2020
c362228
working on rpath stuff
timkpaine Jul 10, 2020
88cbcb8
Add yes to choco
timkpaine Jul 17, 2020
b8344af
attempt to allow empty checksums
timkpaine Jul 17, 2020
c4e1ee6
use cflag now that no cmake
timkpaine Jul 17, 2020
cdb90ca
install tbb-devel in docker images
timkpaine Jul 17, 2020
518a82c
set cxxflags on windows
timkpaine Jul 17, 2020
cc6902a
vendor boost since we only use headers
timkpaine Jul 17, 2020
4e854d9
use curl instead of wget
timkpaine Jul 17, 2020
c15c943
tweak download/extract messages
timkpaine Jul 17, 2020
e522250
verbose
timkpaine Jul 17, 2020
4cc782d
fix path weirdness on windows
timkpaine Jul 17, 2020
3b86f88
remove shutil-which dep on py2, add pathlib dep
timkpaine Jul 17, 2020
292afa3
attempt to solve boost issues on windows
timkpaine Jul 17, 2020
55f5790
copypast
timkpaine Jul 17, 2020
c0273da
adding win32 flags
timkpaine Jul 17, 2020
0dff414
pin pyproject to match
timkpaine Jul 17, 2020
33dd756
copypasta
timkpaine Jul 18, 2020
4cedb83
adding tbb to cflags
timkpaine Jul 18, 2020
5063bb1
Add path to tbb
timkpaine Jul 18, 2020
c71acb3
working on windows :-)
timkpaine Jul 18, 2020
b8796cc
build inplace for testing
timkpaine Jul 18, 2020
ff08268
reorder tests
timkpaine Jul 19, 2020
1a3fc12
some more adjustments
timkpaine Jul 19, 2020
67111fe
Merge branch 'simplify_python_build' of github.com:jpmorganchase/pers…
timkpaine Jul 19, 2020
6c5114b
try to set path
timkpaine Jul 19, 2020
a66d7b4
add debug ldd
timkpaine Jul 20, 2020
93c077b
pip install -v
timkpaine Jul 20, 2020
3675eec
silly error
timkpaine Jul 20, 2020
b8a5a0c
add another test
timkpaine Jul 20, 2020
6b7b6bb
more debug
timkpaine Jul 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ flycheck_*.el
*.so
*.dylib
*.dll
*.pyd

# Fortran module files
*.mod
Expand Down Expand Up @@ -133,6 +134,7 @@ packages/*/cjs
cppbuild
docsbuild
.coverage
cpp/perspective/third

# docs generated
docs/_build
Expand Down
24 changes: 13 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,13 @@ jobs:

- task: NodeTool@0
inputs:

versionSpec: '12.x'

- script: |
choco install tbb -y --allow-empty-checksums
displayName: "System deps"

- script: |
which python > python.txt
set /p PYTHON=<python.txt
Expand All @@ -181,17 +186,14 @@ jobs:
- script: yarn
displayName: 'Install Deps'

- script: yarn build_python --ci $(python_flag)
- script:
set PATH=C:\ProgramData\chocolatey\lib\tbb\tools\tbb41_20130314oss\bin\intel64\vc11;%PATH%
yarn build_python --ci $(python_flag)
displayName: 'build'
env:
# Set `BOOST_ROOT` manually, as `BOOST_ROOT` is removed in the VM:
# https://github.com/actions/virtual-environments/issues/687
# 06/18/2020 - seems like boost got moved to `x86_64` inside
# the boost folder, which broke builds for a bit.
BOOST_ROOT: "C:/hostedtoolcache/windows/Boost/1.69.0/x86_64/"
BOOST_INCLUDEDIR: "C:/hostedtoolcache/windows/Boost/1.69.0/x86_64/include"
BOOST_LIBRARYDIR: "C:/hostedtoolcache/windows/Boost/1.69.0/x86_64/libs"

CFLAGS: /IC:\ProgramData\chocolatey\lib\tbb\tools\tbb41_20130314oss\include\
LDFLAGS: /LIBPATH:C:\ProgramData\chocolatey\lib\tbb\tools\tbb41_20130314oss\lib\intel64\vc11\

- job: 'MacOS_Mojave'
pool:
vmImage: 'macos-10.14'
Expand Down Expand Up @@ -233,7 +235,7 @@ jobs:
versionSpec: '12.x'

- script: |
brew install boost
brew install tbb
displayName: "System deps"

- script: |
Expand Down Expand Up @@ -353,7 +355,7 @@ jobs:
versionSpec: '12.x'

- script: |
brew install boost
brew install tbb
displayName: "System deps"

- script: |
Expand Down
16 changes: 0 additions & 16 deletions cmake/Pybind.txt.in

This file was deleted.

41 changes: 0 additions & 41 deletions cmake/modules/FindNumPy.cmake

This file was deleted.

82 changes: 0 additions & 82 deletions cmake/modules/FindPyArrow.cmake

This file was deleted.

40 changes: 0 additions & 40 deletions cmake/modules/FindPybind.cmake

This file was deleted.

Loading