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

use system lz4 and netcdf #57

Merged
merged 11 commits into from
May 13, 2018
Merged

use system lz4 and netcdf #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a45c5fc
use system lz4 and netcdf
looooo May 7, 2018
73f8aa2
Merge remote-tracking branch 'conda-forge/master' into 'looooo/master'
jakirkham May 13, 2018
7aa0fc2
Use old manual libnetcdf pin to 4.4
jakirkham May 13, 2018
fdae1ad
Use LZ4 to build VTK
jakirkham May 13, 2018
7c2cf9f
Denote CMake BOOL variables
jakirkham May 13, 2018
2382d08
Support HDF5 and jsoncpp on Windows
jakirkham May 13, 2018
c3bc89a
Note HDF5 is a shared library
jakirkham May 13, 2018
679bad2
MNT: Re-rendered with conda-smithy 3.1.2 and pinning 2018.05.07
conda-forge-admin May 13, 2018
a3de304
Bump build number to 4
jakirkham May 13, 2018
99eb93e
Specify LZ4 library name on Windows
jakirkham May 13, 2018
fb76c17
Pin `jsoncpp`
jakirkham May 13, 2018
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
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESAFalsepython2.7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESAFalsepython3.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESAFalsepython3.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESATruepython2.7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'True'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESATruepython3.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'True'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_VTK_WITH_OSMESATruepython3.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'True'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python2.7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.9'
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python3.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.9'
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_python3.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.9'
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/win_python3.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/win_python3.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VTK_WITH_OSMESA:
- 'False'
lz4_c:
- 1.8.1
pin_run_as_build:
lz4_c:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
6 changes: 6 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ cmake .. -G "Ninja" ^
-DVTK_USE_SYSTEM_JPEG:BOOL=ON ^
-DVTK_USE_SYSTEM_TIFF:BOOL=ON ^
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON ^
-DVTK_USE_SYSTEM_HDF5:BOOL=ON ^
-DVTK_EXTERNAL_HDF5_IS_SHARED:BOOL=ON ^
-DVTK_USE_SYSTEM_JSONCPP:BOOL=ON ^
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON ^
-DVTK_USE_SYSTEM_LZ4:BOOL=ON ^
-DLZ4_LIBRARIES:PATH="%LIBRARY_LIB%\liblz4.lib" ^
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Raised this change upstream as issue ( https://gitlab.kitware.com/vtk/vtk/issues/17314 ).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proposed fix in merge request ( https://gitlab.kitware.com/vtk/vtk/merge_requests/5608 ). Please take a look if you have a chance, @looooo.

-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB
if errorlevel 1 exit 1

Expand Down
3 changes: 3 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ cmake .. -G "Ninja" \
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_EXTERNAL_HDF5_IS_SHARED:BOOL=ON \
-DVTK_USE_SYSTEM_JSONCPP:BOOL=ON \
-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB \
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
-DVTK_USE_SYSTEM_LZ4:BOOL=ON \
${SCREEN_ARGS[@]} ${WITH_OSMESA[@]}

# compile & install!
Expand Down
14 changes: 9 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "8.1.0" %}
{% set build_number = 3 %}
{% set build_number = 4 %}
{% set minor_version = ".".join(version.split(".")[:2]) %}

{% set build_number = build_number + 200 %} # [not VTK_WITH_OSMESA]
Expand Down Expand Up @@ -30,30 +30,34 @@ requirements:
# VTK Third Party dependencies
- zlib 1.2.11
- freetype 2.8.1
- hdf5 1.10.1 # [unix]
- hdf5 1.10.1
- libxml2 2.9.*
- libpng >=1.6.32,<1.6.35
- jpeg 9*
- libtiff >=4.0.8,<4.0.10
- jsoncpp # [unix]
- jsoncpp 1.8.1
- expat 2.2.*
- tbb
- mesalib # [VTK_WITH_OSMESA]
- libnetcdf 4.4.*
- lz4-c
run:
- python
- future # used in the generated python wrappers
# VTK Third Party dependencies
- zlib 1.2.11
- freetype 2.8.1
- hdf5 1.10.1 # [unix]
- hdf5 1.10.1
- libxml2 2.9.*
- libpng >=1.6.32,<1.6.35
- jpeg 9*
- libtiff >=4.0.8,<4.0.10
- jsoncpp # [unix]
- jsoncpp 1.8.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding to the pinning file in PR ( conda-forge/conda-forge-pinning-feedstock#60 ).

- expat 2.2.*
- tbb
- mesalib # [VTK_WITH_OSMESA]
- libnetcdf 4.4.*
- lz4-c

test:
imports:
Expand Down