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

pyktx (Python bindings for libktx) #698

Merged
merged 138 commits into from
Nov 29, 2023
Merged
Changes from 1 commit
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
85fe8b1
Setup Python bindings for libktx ktxTexture
ShukantPal Jan 6, 2023
054c4a2
Setup workflows for building Python
ShukantPal Jan 8, 2023
725f7cf
Fix Python build dependencies in CMakeLists.txt
ShukantPal Jan 8, 2023
a585ae3
FEATURE_PY on for all package matrix
ShukantPal Jan 8, 2023
c2d72a6
Use ktx_uint32_t vs uint32_t to fix compile errors
ShukantPal Jan 8, 2023
17c6a4e
Fix errors in ktx_texture2.c when compiling on Windows
ShukantPal Jan 8, 2023
976b30a
Use LIBKTX_INSTALL_DIR to find KTX-Software installation
ShukantPal Jan 8, 2023
577cddc
Set FEATURE_PY to ON
ShukantPal Jan 8, 2023
cb0c0a2
Add SPDX license identifer to all files & update copyright year
ShukantPal Jan 8, 2023
2b01bc1
Connect $FEATURE_PY to -DKTX_FEATURE_PY
ShukantPal Jan 8, 2023
e61db4d
Fixe ps1 script
ShukantPal Jan 8, 2023
5864355
Create publishing workflow
ShukantPal Jan 8, 2023
58de535
Debug binary dir on macOS
ShukantPal Jan 8, 2023
0d001fe
Fix LDFLAGS for Xcode gen projec
ShukantPal Jan 8, 2023
e4c288a
Add copyright header to .gitignore
ShukantPal Jan 8, 2023
297f92b
debug python on linux
ShukantPal Jan 8, 2023
61a3cfa
Add wheels in requirements.txt and install deps before Python build
ShukantPal Jan 8, 2023
94306eb
Inject include & lib dir for build.py
ShukantPal Jan 8, 2023
c058563
Set LIBKTX_LIB_DIR using $<CONFIG> to find libraries to link
ShukantPal Jan 8, 2023
1c466df
Add python3 addon to Travis CI and print sys.version in build script …
ShukantPal Jan 8, 2023
c2083a0
Install x64 Python on GH Actions, override $PYTHON on Appveyor
ShukantPal Jan 8, 2023
04112b4
Update ci_scripts/build_win.ps1
ShukantPal Jan 8, 2023
0dd4a54
Fix PS script
ShukantPal Jan 8, 2023
1618cd7
Don't try to build on arm64, continue with python on Linux
ShukantPal Jan 8, 2023
bb4da0c
Fix LIBKTX_LIB_DIR on linux & try to fix .appveyor.yml
ShukantPal Jan 9, 2023
70a218b
try to repair .appveyor.yml
ShukantPal Jan 9, 2023
0138c78
try to repair by not passing $PYTHON to cmake
ShukantPal Jan 9, 2023
68b8941
remove problematic print statement
ShukantPal Jan 9, 2023
4b60077
make sure PYTHON is used to prevent warning
ShukantPal Jan 9, 2023
61e78f9
pyktx tests
ShukantPal Jan 11, 2023
7fff243
Add buildscript for python tests
ShukantPal Jan 11, 2023
7d91d74
pyktx tests
ShukantPal Jan 11, 2023
d59e859
Add copyright headers
ShukantPal Jan 11, 2023
1eae841
Don't keep file open before passing it to KtxTexture1
ShukantPal Jan 11, 2023
df83dd4
--output-on-failure ctest
ShukantPal Jan 19, 2023
f164a3d
Fix os.add_dll_directory, DYLD_LIBRARY_PATH for Windows & macOS
ShukantPal Jan 19, 2023
196078e
Disable pyktx tests on WIN32 and update LD_LIBRARY_PATH on Linux
ShukantPal Jan 19, 2023
5322872
Remove KTX_FEATURE_PY_BDIST
ShukantPal Jun 5, 2023
f909bac
Merge branch 'main' of https://github.com/KhronosGroup/KTX-Software i…
ShukantPal Jun 5, 2023
3c95d22
Configure KTX_FEATURE_PY in Windows build
ShukantPal Jun 5, 2023
1ec5be3
Turn OFF FEATURE_PY for arm64 macOS since it needs a cross-compiled P…
ShukantPal Jun 5, 2023
5fe2a4c
Specify path for PYTHON on Windows
ShukantPal Jun 5, 2023
713e493
Update PYTHON path
ShukantPal Jun 5, 2023
89ddcf8
Set PYTHON path to include the filename
ShukantPal Jun 5, 2023
e476312
Remove /out from .gitignore
ShukantPal Jun 5, 2023
353d7d6
Update ci_scripts/build_linux.sh
ShukantPal Jun 5, 2023
66a0a63
Merge branch 'main' into python
ShukantPal Jun 11, 2023
827f638
Merge remote-tracking branch 'khronos/main' into python
ShukantPal Jul 2, 2023
b0b801f
Pin Python installation version
ShukantPal Jul 2, 2023
4c54cfa
Merge branch 'main' into python
MarkCallow Jul 7, 2023
5505ac4
Run publishing workflow on push of tags, restrict to main branch
ShukantPal Jul 12, 2023
3eff1b4
Merge remote-tracking branch 'khronos/main' into python
ShukantPal Jul 29, 2023
39f337a
Merge remote-tracking branch 'khronos/main' into python
ShukantPal Jul 29, 2023
4c48862
2 step workflow to restricting publishing to main
ShukantPal Jul 29, 2023
c47d468
Remove dual steps, run pypi job only on main branch
ShukantPal Jul 29, 2023
7a30c0f
Pass in LIBKTX_VERSION to setup.py from CMake
ShukantPal Jul 29, 2023
0bd693f
Add Python docs
ShukantPal Jul 29, 2023
3231c64
Update interface/python_binding/pyktx/ktx_texture.py
ShukantPal Jul 30, 2023
cf34f75
Update ci_scripts/build_linux.sh
ShukantPal Jul 30, 2023
172e256
Update .github/workflows/publish.yml
ShukantPal Jul 30, 2023
736768e
Add ZLIB supercompression
ShukantPal Jul 30, 2023
aba1e83
Run tests on Windows CI
ShukantPal Jul 30, 2023
82352a5
Merge branch 'main' into python
ShukantPal Aug 1, 2023
db3ff2d
Set up Sphinx
ShukantPal Aug 1, 2023
d3e04d0
Run sphinx on CMake build
ShukantPal Aug 1, 2023
4ef7054
Use -m switch to run sphinx-apidoc
ShukantPal Aug 1, 2023
389610f
Add -m switch
ShukantPal Aug 1, 2023
cf61a64
Set SPHINXBUILD on Windows
ShukantPal Aug 1, 2023
a1bddc0
Use cmake_path SET to get forward-slash path
ShukantPal Aug 1, 2023
599b057
Keep _static folder in VCS
ShukantPal Aug 1, 2023
a9c8c93
Explicitly set LIBKTX_INCLUDE_DIR, LIBKTX_LIB_DIR when running docs
ShukantPal Aug 1, 2023
68e263d
Add copyright & licensing information to new files
ShukantPal Aug 1, 2023
7dfc21e
Include pyktx reference in Doxygen website
ShukantPal Sep 4, 2023
1915fe8
Link to pyktx docs in other doxyLayout files
ShukantPal Sep 18, 2023
fcd018e
Merge branch 'main' of https://github.com/KhronosGroup/KTX-Software i…
ShukantPal Oct 6, 2023
ca42812
--no-warn-script-location in pip
ShukantPal Oct 24, 2023
ecb1b77
Remove _EXT suffix in VkFormat enum
ShukantPal Oct 27, 2023
eb4115b
Use build frontend to avoid SetuptoolsDeprecationWarning
ShukantPal Oct 28, 2023
7fd1dae
Re-order CMake commands so pip is installed before build
ShukantPal Nov 3, 2023
83f01de
Make sure rpath is set when doing dev build
ShukantPal Nov 3, 2023
774b988
Make sure target dependencies are in order
ShukantPal Nov 3, 2023
48d92fe
Don't add DEPENDS to .o files
ShukantPal Nov 3, 2023
3489f66
Fix python -m build invoking build.py instead of actual build
ShukantPal Nov 3, 2023
d53b560
Don't set runtime_library_dirs on Windows
ShukantPal Nov 3, 2023
f05827f
Fix parens
ShukantPal Nov 3, 2023
fe346df
fix if
ShukantPal Nov 3, 2023
cf40f94
Add .dll to path
ShukantPal Nov 3, 2023
3301529
Use ; instead of : on Windows
ShukantPal Nov 3, 2023
7379fc7
Remove byproducts
ShukantPal Nov 3, 2023
eeab68c
Retrigger CI after GitHub outage
ShukantPal Nov 3, 2023
0d44ab5
Use if (WIN32) to set PATH instead
ShukantPal Nov 9, 2023
fad1b7d
Trying wrapping in double quotes
ShukantPal Nov 10, 2023
cc71c29
Log path
ShukantPal Nov 10, 2023
e297c85
Try using platform id for set
ShukantPal Nov 10, 2023
55acee6
Debug WIN32 branch
ShukantPal Nov 10, 2023
d9028ec
print libdir
ShukantPal Nov 10, 2023
92eabf5
try switching order
ShukantPal Nov 10, 2023
e627cf1
wrap PATH_WITH_KTX_DLLS in double quotes to avoid list eval
ShukantPal Nov 10, 2023
fbcc15e
Set path to single folder
ShukantPal Nov 10, 2023
41d11fe
fat if else
ShukantPal Nov 10, 2023
f9e51e3
Use 2nd command to set path
ShukantPal Nov 10, 2023
d5eab06
Use CMAKE_MSVCIDE_RUN_PATH instead
ShukantPal Nov 10, 2023
80f4039
set MSVC_IDE to 1
ShukantPal Nov 11, 2023
085183c
Use os.add_dll_directory instead
ShukantPal Nov 11, 2023
484e84e
Use normpath to add DLL dir
ShukantPal Nov 11, 2023
2996a35
test print
ShukantPal Nov 11, 2023
00cbf04
What's os.name?
ShukantPal Nov 11, 2023
5602cc0
What's os.name?
ShukantPal Nov 11, 2023
a840170
Run tests first
ShukantPal Nov 11, 2023
78fcb34
try printing in __main__ if
ShukantPal Nov 11, 2023
2e650b7
Link against .lib import library in buildscript.py
ShukantPal Nov 12, 2023
2e99132
Revert to old style CMakeLists.txt
ShukantPal Nov 13, 2023
dcc3969
No output spec
ShukantPal Nov 13, 2023
131d27d
no prebuild declarator
ShukantPal Nov 13, 2023
8e0452f
speed up VS 2019 by ignoring build + fix deleted var
ShukantPal Nov 13, 2023
9753133
fix deleted pyktx-dep ref
ShukantPal Nov 13, 2023
87a8f00
Delete out/
ShukantPal Nov 13, 2023
b1cb133
Ignore out/ again
ShukantPal Nov 13, 2023
97ba064
Use unquoted python -m sphinx so it can be used in Xcode build
ShukantPal Nov 15, 2023
3c620cf
Set BYPRODUCTS for build cleaning
ShukantPal Nov 24, 2023
b4f0d43
Run sdist, bdist, docs build in KTX_BUILD_DIR instead
ShukantPal Nov 24, 2023
e4b42ab
Copy _static directory and also add back button in docs
ShukantPal Nov 24, 2023
ba30f39
Merge branch 'main' into python
ShukantPal Nov 24, 2023
2cfd852
Use separate command for copy_directory
ShukantPal Nov 24, 2023
3f1f286
Upload pyktx artifacts from Windows build
ShukantPal Nov 24, 2023
5e001fa
Test builds on Linux
ShukantPal Nov 25, 2023
98f919b
Delete debug statements
ShukantPal Nov 25, 2023
9b59d81
Handle default installation & build README
ShukantPal Nov 25, 2023
a62b579
Fix typo
ShukantPal Nov 25, 2023
98e9d45
Merge branch 'main' into python
ShukantPal Nov 25, 2023
8660459
Install python3-venv on Linux CI
ShukantPal Nov 25, 2023
3096999
More details on build & usage
ShukantPal Nov 25, 2023
e283893
Upload wheels from Travis CI too
ShukantPal Nov 25, 2023
899749f
Use /usr/include & /usr/lib on Linux
ShukantPal Nov 25, 2023
c260d4f
Update LIBKTX_LIB_DIR for Linux
ShukantPal Nov 27, 2023
969d9ef
Add note regarding ld warning
ShukantPal Nov 28, 2023
88c68f8
Link to the pyktx README
ShukantPal Nov 28, 2023
8473bdd
Update interface/python_binding/README.md
ShukantPal Nov 28, 2023
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
print libdir
  • Loading branch information
ShukantPal committed Nov 10, 2023
commit d9028ec9fe87dd670342a23b7ede4b3ff4c8f567
2 changes: 1 addition & 1 deletion interface/python_binding/buildscript.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
if LIBKTX_LIB_DIR is None:
LIBKTX_LIB_DIR = '/usr/local/lib'

print(f"TEST PATH IS {os.getenv('PATH')}")
print(f"TEST LIBDIR IS {os.getenv('LIBKTX_LIB_DIR')}")

ffibuilder = FFI()

Expand Down