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.

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

PR: Enable libPNG support #2379

Merged
merged 120 commits into from
Jul 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
2b78943
Add libpng requirement into conda recipe
andfoy Jun 8, 2020
23255aa
Try to install libjpeg-turbo
andfoy Jun 8, 2020
006ab0c
Add PNG reading capabilities
r-zenine Feb 13, 2020
7b9ec24
Remove newline
andfoy Jun 11, 2020
f97a9f0
Add image extension to compilation instructions
andfoy Jun 11, 2020
ac6d26e
Include png functions as part of the main library
andfoy Jun 11, 2020
b14912e
Update CMakeLists
andfoy Jun 11, 2020
770cea5
Detect if building on conda-build
andfoy Jun 11, 2020
0861b80
Debug
andfoy Jun 11, 2020
a42a029
More debug messages
andfoy Jun 11, 2020
b7a19ea
Print globbed libreries
andfoy Jun 12, 2020
1afde4d
Print globbed libreries
andfoy Jun 12, 2020
386fd5b
Point to correct PNG path
andfoy Jun 12, 2020
2b5c469
Remove libJPEG preventively
andfoy Jun 12, 2020
0341aa5
Debug extension loading
andfoy Jun 12, 2020
721e5e3
Link libpng explicitly
andfoy Jun 12, 2020
2186d68
Link with PNG
andfoy Jun 12, 2020
b80fb08
Add libpng requirement into conda recipe
andfoy Jun 8, 2020
3d153f0
Try to install libjpeg-turbo
andfoy Jun 8, 2020
36b0a8f
Add PNG reading capabilities
r-zenine Feb 13, 2020
9d14d9e
Remove newline
andfoy Jun 11, 2020
852a289
Add image extension to compilation instructions
andfoy Jun 11, 2020
3e86f49
Include png functions as part of the main library
andfoy Jun 11, 2020
021e767
Update CMakeLists
andfoy Jun 11, 2020
e734175
Detect if building on conda-build
andfoy Jun 11, 2020
58c6524
Debug
andfoy Jun 11, 2020
b9295c1
More debug messages
andfoy Jun 11, 2020
02fa9d9
Print globbed libreries
andfoy Jun 12, 2020
6c757d4
Print globbed libreries
andfoy Jun 12, 2020
c207eab
Point to correct PNG path
andfoy Jun 12, 2020
a1aa2e6
Remove libJPEG preventively
andfoy Jun 12, 2020
34fc7d6
Debug extension loading
andfoy Jun 12, 2020
3ed2044
Link libpng explicitly
andfoy Jun 12, 2020
eaaf658
Link with PNG
andfoy Jun 12, 2020
3edae46
Merge branch 'add_libpng' of github.com:andfoy/vision into add_libpng
andfoy Jun 12, 2020
c17202e
Install libpng on conda-based wheel distributions
andfoy Jun 12, 2020
741f855
Add -y flag
andfoy Jun 12, 2020
a46f503
Add -y flag to yum
andfoy Jun 12, 2020
4bad033
Locate LibPNG on windows conda
andfoy Jun 12, 2020
b419fc1
Remove empty else
andfoy Jun 12, 2020
83eff79
Copy libpng16.so
andfoy Jun 12, 2020
eb2846f
Copy dylib on Mac
andfoy Jun 12, 2020
3563ef3
Improve check on Windows
andfoy Jun 13, 2020
347383f
Try to install ninja using conda on windows
andfoy Jun 15, 2020
51f6b48
Use libpng on Windows
andfoy Jun 15, 2020
ad00442
Package lib on windows wheel
andfoy Jun 15, 2020
4d82283
Point library to the correct place
andfoy Jun 15, 2020
32b2207
Include binaries as part of wheel
andfoy Jun 15, 2020
9a5aefe
Copy libpng.so on linux
andfoy Jun 15, 2020
a44c3b5
Look for png.h on Windows when using conda-build
andfoy Jun 15, 2020
dfcde68
Do not skip png tests on Mac/Win
andfoy Jun 15, 2020
d8d46d6
Restore libjpeg-turbo
andfoy Jun 15, 2020
eea8552
Install jpeg-turbo on wheel distributions
andfoy Jun 15, 2020
8c7dc31
Install libjpeg-turbo from conda-forge on wheel distributions
andfoy Jun 15, 2020
ee8148a
Do not pull av on conda-build
andfoy Jun 15, 2020
059fa42
Add pillow disclaimer
andfoy Jun 15, 2020
0ed1af6
Vendors libjpeg-turbo 2.0.4
r-zenine Feb 14, 2020
11d1a7a
Merge JPEG work
r-zenine Feb 15, 2020
3bb65ba
Remove submodules
andfoy Jun 15, 2020
c334d7e
Regenerate circle config
andfoy Jun 15, 2020
5650e59
Fix style issues
andfoy Jun 15, 2020
7894836
Fix C++ style issues
andfoy Jun 15, 2020
2da51d4
More style corrections
andfoy Jun 15, 2020
78455ae
Add JPEG-turbo to linking libraries
andfoy Jun 15, 2020
a0a383d
More style corrections
andfoy Jun 15, 2020
f143e2c
More style corrections
andfoy Jun 15, 2020
95cc941
More style corrections
andfoy Jun 15, 2020
1c9270a
Install libjpeg-turbo-devel
andfoy Jun 15, 2020
ee388e5
Install libturbo-jpeg on typing pipeline
andfoy Jun 15, 2020
462ed6c
Update Circle template
andfoy Jun 15, 2020
989db57
Windows and Unix turbojpeg have the same linking name
andfoy Jun 15, 2020
6e9ad0e
Install turbojpeg-devel instead of libjpeg-turbo
andfoy Jun 15, 2020
dd43bcd
Copy TurboJPEG binaries to wheel
andfoy Jun 15, 2020
e542e48
Move test image
andfoy Jun 16, 2020
b5fa45e
Move back test image
andfoy Jun 16, 2020
3e90556
Update JPEG test path
andfoy Jun 16, 2020
4e09af0
Remove dot from extension
andfoy Jun 16, 2020
c2e9bf3
Merge branch 'master' into add_libpng
andfoy Jun 17, 2020
8ac335e
Move image functions to extension
andfoy Jun 18, 2020
2adb87e
Use stdout arg in subprocess
andfoy Jun 18, 2020
44826a7
Disable image extension if libpng or turbojpeg are not found
andfoy Jun 18, 2020
1e830ea
Append libpng stdout
andfoy Jun 18, 2020
37c889b
Prevent list appending on lists
andfoy Jun 18, 2020
3cca366
Minor path correction
andfoy Jun 18, 2020
2a6ff9f
Minor error correction
andfoy Jun 18, 2020
b89b349
Add linking flags
andfoy Jun 18, 2020
264cb74
Merge branch 'add_libpng' of github.com:andfoy/vision into add_libpng
andfoy Jun 19, 2020
a0ce4ca
Style issues correction
andfoy Jun 19, 2020
bd752aa
Address minor review corrections
andfoy Jun 22, 2020
5259757
Refactor library search
andfoy Jun 23, 2020
3013247
Restore access index
andfoy Jun 23, 2020
9d8b1b5
Fix JPEG tests
andfoy Jun 23, 2020
7c3ec51
Update libpng version in Travis
andfoy Jun 23, 2020
158eec8
Add -y flag
andfoy Jun 23, 2020
269d8e5
Remove dot
andfoy Jun 23, 2020
273dc1a
Update libpng using apt
andfoy Jun 23, 2020
cfc7c75
Check libpng version
andfoy Jun 23, 2020
d32a5f0
Change libturbojpeg binary
andfoy Jun 23, 2020
051425b
Update import
andfoy Jun 23, 2020
3bc7323
Change call
andfoy Jun 23, 2020
6b87895
Restore av in conda recipe
andfoy Jun 24, 2020
af61f94
Merge with master
andfoy Jun 29, 2020
123fd3f
Minor error correction
andfoy Jun 29, 2020
831749c
Remove unused comment in travis.yml
andfoy Jun 29, 2020
558b0cb
Update README
andfoy Jun 29, 2020
8b2f507
Fix missing links
andfoy Jun 29, 2020
b560227
Remove fixes for 16.04
andfoy Jun 30, 2020
c6d3ebe
Remove JPEG-related code
andfoy Jul 1, 2020
39a0334
Remove installation references to turbojpeg
andfoy Jul 1, 2020
923ae59
Merge remote-tracking branch 'upstream/master' into add_png
andfoy Jul 1, 2020
4a1357e
Remove further references to turbojpeg
andfoy Jul 1, 2020
b2fd151
Fix c++ style issues
andfoy Jul 1, 2020
0fc3135
Fix c++ style issues
andfoy Jul 1, 2020
ce92995
Fix libpng-config include flag parsing
andfoy Jul 1, 2020
2614a9c
Remove conda-forge
andfoy Jul 1, 2020
bf41911
Remove include dirs from main extension
andfoy Jul 1, 2020
eb23830
Do not pass extra include and library paths to main torchvision exten…
andfoy Jul 1, 2020
c41800c
Add libpng to environment.yml
andfoy Jul 1, 2020
b1ff783
Remove inexistent imports
andfoy Jul 1, 2020
84dad44
Add instructions regarding environment variables to README
andfoy Jul 1, 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
Prev Previous commit
Next Next commit
Debug
  • Loading branch information
andfoy committed Jun 12, 2020
commit 58c652473657e5f13e123684c0f3725f7edafcba
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def get_extensions():
# Check if building on Conda
build_prefix = os.environ.get('BUILD_PREFIX', None)
is_conda_build = build_prefix is not None
print('Running build on conda-build: {0}'.format(is_conda_build))
if is_conda_build:
# Add LibPNG headers/libraries
png_include = os.path.join(build_prefix, 'include/libpng16/png')
Expand Down