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

Packaging QuadDType #100

Open
wants to merge 185 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
1575ac4
packaging quaddtype
SwayamInSync Aug 23, 2024
00da2c7
fixing missing dependency
SwayamInSync Aug 23, 2024
5333273
removing re-init of conda
SwayamInSync Aug 23, 2024
2ad4b40
fixing wget issues and env issues
SwayamInSync Aug 23, 2024
26f64ea
fixing PATH issues
SwayamInSync Aug 23, 2024
028a62f
trying to resolve path intereference with cibuildwheel
SwayamInSync Aug 23, 2024
5dcc19b
remoed CIBW_ENVIRONMENT
SwayamInSync Aug 23, 2024
7487a39
reduced verbosity level and added CXXFLAG
SwayamInSync Aug 23, 2024
5234cd2
fixing Py_NewRef error by switching to Py 3.10
SwayamInSync Aug 23, 2024
a582290
fixing manylinux issues
SwayamInSync Aug 23, 2024
7e1028f
fixing toml multiline issue :)
SwayamInSync Aug 23, 2024
b00f74a
my bad conda typo
SwayamInSync Aug 23, 2024
0644f28
still fixing multilinux issue
SwayamInSync Aug 23, 2024
9288f5f
hmmm maybe can try switching to devtoolset-8
SwayamInSync Aug 23, 2024
468e329
replacng problematic yum commands by standalone installation
SwayamInSync Aug 23, 2024
8f3d623
switchg to curl
SwayamInSync Aug 23, 2024
667aabc
using abs paths for linux paths
SwayamInSync Aug 23, 2024
590b682
switching to auditool for linux
SwayamInSync Aug 23, 2024
5258efa
fixing syntax issue
SwayamInSync Aug 23, 2024
62be500
switching to manylinux_2_28_x86_64
SwayamInSync Aug 23, 2024
12d5092
fixing testing environment issues
SwayamInSync Aug 23, 2024
607ef05
commenting windows for now
SwayamInSync Aug 23, 2024
3677bcc
removing windows
SwayamInSync Aug 23, 2024
6b0d1f6
switching to macos-latest in workflow
SwayamInSync Aug 23, 2024
f105239
removing patchelf
SwayamInSync Aug 23, 2024
20746a5
adding package-config file for sleef
SwayamInSync Aug 23, 2024
d475bee
sleef dep by pkg-config first
SwayamInSync Aug 23, 2024
6fb2df3
fixing macos sleef not found
SwayamInSync Aug 23, 2024
7962f5d
simplifying process and using pkg-config
SwayamInSync Aug 23, 2024
f6c6700
typo fix
SwayamInSync Aug 23, 2024
c98744b
trying some tweaks
SwayamInSync Aug 23, 2024
a1ccfc7
testing CI
SwayamInSync Aug 23, 2024
59c3585
removed patchelf
SwayamInSync Aug 23, 2024
cb175bc
only macos
SwayamInSync Aug 23, 2024
6f8e40c
adding support for macos-arm
SwayamInSync Aug 23, 2024
75179ba
pushing fixes for Py3.13
SwayamInSync Aug 23, 2024
6d958fc
supporting till 3.12
SwayamInSync Aug 23, 2024
8e9f369
switching back to prev
SwayamInSync Aug 23, 2024
3a3d38f
fixing x86 & arm for mac
SwayamInSync Aug 23, 2024
b054b45
fixing workflow
SwayamInSync Aug 23, 2024
ec2d2ec
fixing workflow
SwayamInSync Aug 23, 2024
899f256
fixing workflow
SwayamInSync Aug 23, 2024
ca8eda0
fixing workflow
SwayamInSync Aug 23, 2024
9a5ba62
fixing meson issues
SwayamInSync Aug 23, 2024
62de91d
fixing branch in workflow
SwayamInSync Aug 23, 2024
c2a7595
installing wget for linux
SwayamInSync Aug 23, 2024
543eaf7
simplifying to make it work
SwayamInSync Aug 23, 2024
d6a98db
fixing stupid typo
SwayamInSync Aug 23, 2024
e924a0a
testing linux
SwayamInSync Aug 23, 2024
4cf263c
testing macos-13
SwayamInSync Aug 23, 2024
2d78060
added MACOSX_DEPLOYMENT_TARGET=10.13
SwayamInSync Aug 23, 2024
6961f5f
testing macos-14
SwayamInSync Aug 23, 2024
dabbc9e
testing linux one last time
SwayamInSync Aug 23, 2024
e780c2c
testing windows
SwayamInSync Aug 23, 2024
e098c42
switching to cmd
SwayamInSync Aug 23, 2024
ee7e804
trying again
SwayamInSync Aug 23, 2024
26b46a9
going complete vanilla
SwayamInSync Aug 23, 2024
9a2e6a6
using bitsadmin
SwayamInSync Aug 23, 2024
071879a
installing powershell with winget
SwayamInSync Aug 23, 2024
82021f8
pushing for linux, mac
SwayamInSync Aug 23, 2024
3fe7899
win: switch to curl
SwayamInSync Aug 24, 2024
29085b0
win: switch to curl
SwayamInSync Aug 24, 2024
406bf50
win: switch to Python
SwayamInSync Aug 24, 2024
bb2f001
win: switch to powershell
SwayamInSync Aug 24, 2024
e01907a
win: switch to powershell
SwayamInSync Aug 24, 2024
779736e
win: switch to pwsh
SwayamInSync Aug 24, 2024
9a523a5
win: refacgor
SwayamInSync Aug 24, 2024
4a3cfa6
win: refactor
SwayamInSync Aug 24, 2024
5622a2a
win: refactor
SwayamInSync Aug 24, 2024
d2e9495
win: refactor
SwayamInSync Aug 24, 2024
8ab8a0c
win: refactor
SwayamInSync Aug 24, 2024
6199620
win: refactor
SwayamInSync Aug 24, 2024
d6c555f
win: refactor
SwayamInSync Aug 24, 2024
b3bbbc3
win: refactor
SwayamInSync Aug 24, 2024
ff1f28d
win: refactor
SwayamInSync Aug 24, 2024
1e7cce5
win: refactor
SwayamInSync Aug 24, 2024
9549817
win: refactor
SwayamInSync Aug 24, 2024
3bbb0ae
win: refactor
SwayamInSync Aug 24, 2024
d2e19bb
win: refactor
SwayamInSync Aug 24, 2024
0119906
win: refactor
SwayamInSync Aug 24, 2024
36d4dab
fixing win
SwayamInSync Aug 24, 2024
2729a2f
fixing win
SwayamInSync Aug 24, 2024
9429ca8
fixing win
SwayamInSync Aug 24, 2024
8261c63
fixing win
SwayamInSync Aug 24, 2024
7405e4d
fixing win
SwayamInSync Aug 24, 2024
72b597e
fixing win
SwayamInSync Aug 24, 2024
0f58cea
fixing win
SwayamInSync Aug 24, 2024
cec6949
fixing win
SwayamInSync Aug 24, 2024
a8d2314
fixing win
SwayamInSync Aug 24, 2024
30883aa
fixing win
SwayamInSync Aug 24, 2024
3def6f9
fixing win
SwayamInSync Aug 24, 2024
328cad6
fixing win
SwayamInSync Aug 24, 2024
843f9c1
fixing win
SwayamInSync Aug 24, 2024
de462e3
ignoring win for now
SwayamInSync Aug 24, 2024
c00e50a
adding testpypi
SwayamInSync Aug 24, 2024
abd5826
fixed wheel location
SwayamInSync Aug 24, 2024
dd82dda
fixed wheel location
SwayamInSync Aug 24, 2024
b6dee9e
removed psi file as ignoring windows currently
SwayamInSync Aug 24, 2024
7aff5f1
testing win
SwayamInSync Aug 25, 2024
1cf9918
win: changed action
SwayamInSync Aug 25, 2024
63a48de
edit win
SwayamInSync Aug 25, 2024
f64291c
meson edit
SwayamInSync Aug 25, 2024
710ad26
meson edit
SwayamInSync Aug 25, 2024
6c48ddc
refactoring linux and macos
SwayamInSync Aug 25, 2024
2f47d2b
fixing python env
SwayamInSync Aug 25, 2024
34cbc76
refactoring useless env
SwayamInSync Aug 25, 2024
240fcb3
testing linux
SwayamInSync Aug 25, 2024
ddb5e0b
testing macos
SwayamInSync Aug 25, 2024
8ede508
testing macos
SwayamInSync Aug 25, 2024
9627822
testing macos
SwayamInSync Aug 25, 2024
a46a3d0
testing mac
SwayamInSync Aug 25, 2024
b551a27
testing mac
SwayamInSync Aug 25, 2024
1f4f370
testing mac
SwayamInSync Aug 25, 2024
dff3ad6
testing mac
SwayamInSync Aug 25, 2024
9546082
testing mac
SwayamInSync Aug 25, 2024
23db450
testing mac
SwayamInSync Aug 25, 2024
cefde30
testing mac
SwayamInSync Aug 25, 2024
87707c9
testing mac
SwayamInSync Aug 25, 2024
4b71bc8
testing mac
SwayamInSync Aug 25, 2024
3e0cd78
testing mac
SwayamInSync Aug 25, 2024
4278843
testing mac
SwayamInSync Aug 25, 2024
b200adb
testing mac
SwayamInSync Aug 25, 2024
3e0938e
testing mac
SwayamInSync Aug 25, 2024
8d110df
testing mac
SwayamInSync Aug 25, 2024
b0753c5
testing mac
SwayamInSync Aug 25, 2024
eee4533
testing mac
SwayamInSync Aug 25, 2024
e57909e
testing mac
SwayamInSync Aug 25, 2024
959c9be
testing mac
SwayamInSync Aug 25, 2024
7a56e41
testing mac
SwayamInSync Aug 25, 2024
2f0e02e
testing mac
SwayamInSync Aug 25, 2024
59ac155
testing mac
SwayamInSync Aug 25, 2024
5373d0b
testing mac
SwayamInSync Aug 25, 2024
63fa579
testing mac
SwayamInSync Aug 25, 2024
8b3192b
testing mac
SwayamInSync Aug 25, 2024
c75c11d
testing mac
SwayamInSync Aug 25, 2024
43d664c
testing mac
SwayamInSync Aug 25, 2024
90d9534
testing mac
SwayamInSync Aug 25, 2024
5e59a0e
testing mac
SwayamInSync Aug 25, 2024
659c2ad
testing mac
SwayamInSync Aug 25, 2024
2375e0d
testing mac
SwayamInSync Aug 25, 2024
7bdea6f
testing mac
SwayamInSync Aug 25, 2024
c473eb7
testing mac
SwayamInSync Aug 25, 2024
0059e15
final test
SwayamInSync Aug 25, 2024
decab07
testing win
SwayamInSync Aug 26, 2024
4ed0f2d
testing win
SwayamInSync Aug 26, 2024
b79048c
testing win
SwayamInSync Aug 26, 2024
ffdb44b
testing win
SwayamInSync Aug 26, 2024
89e0f90
testing win
SwayamInSync Aug 26, 2024
795938e
testing win
SwayamInSync Aug 26, 2024
3c6bf2e
testing win
SwayamInSync Aug 26, 2024
51d9eab
testing win
SwayamInSync Aug 26, 2024
111a23a
testing win
SwayamInSync Aug 26, 2024
10cb69e
testing win
SwayamInSync Aug 26, 2024
257a6e5
testing win
SwayamInSync Aug 26, 2024
38dfad8
testing win
SwayamInSync Aug 26, 2024
9646bb8
testing win
SwayamInSync Aug 26, 2024
8d1a44a
testing win
SwayamInSync Aug 26, 2024
44781ae
testing win
SwayamInSync Aug 26, 2024
afff7cf
testing win
SwayamInSync Aug 26, 2024
d4e007e
testing win
SwayamInSync Aug 26, 2024
d5f5141
testing win
SwayamInSync Aug 26, 2024
911085b
testing win
SwayamInSync Aug 26, 2024
9abc75c
testing win
SwayamInSync Aug 26, 2024
d7c4b51
testing win
SwayamInSync Aug 26, 2024
6ce30b8
testing win
SwayamInSync Aug 26, 2024
eda1a31
testing win
SwayamInSync Aug 26, 2024
f6c3706
testing win
SwayamInSync Aug 26, 2024
f85abd7
testing win
SwayamInSync Aug 26, 2024
9a086e3
testing win
SwayamInSync Aug 26, 2024
9de1629
testing win
SwayamInSync Aug 26, 2024
4d3df6f
testing win
SwayamInSync Aug 26, 2024
4f2db17
testing win
SwayamInSync Aug 26, 2024
5b4fe75
testing win
SwayamInSync Aug 26, 2024
ca9f75a
final test
SwayamInSync Aug 26, 2024
bca4df3
Adding all the workflows in single file
SwayamInSync Aug 26, 2024
f29095e
fixing local CI
SwayamInSync Aug 26, 2024
b8132d2
fixing CI
SwayamInSync Aug 26, 2024
fe8b540
fixing CI
SwayamInSync Aug 26, 2024
e429a9b
merging CI fixes
SwayamInSync Aug 26, 2024
ac51015
setting trigger branch to main
SwayamInSync Aug 26, 2024
1493a9b
Squashed commit of the following:
SwayamInSync Sep 25, 2024
cb77ce4
refactoring
SwayamInSync Sep 25, 2024
770715b
Merge branch 'main' into quaddtype-packaging
SwayamInSync Sep 25, 2024
99ed1f8
removed unnecessary env-var
SwayamInSync Sep 25, 2024
f9ced6e
win: replacing conda with manual sleef build
Sep 26, 2024
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
fixing CI
SwayamInSync committed Aug 26, 2024
commit b8132d29f211637c4b38eebab897c4f8649b325b
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -66,11 +66,10 @@ jobs:
cmake -S . -B build -DSLEEF_BUILD_QUAD:BOOL=ON -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
cmake --build build/ --clean-first -j
sudo cmake --install build --prefix /usr
export SLEEF_PATH=/usr
- name: Install quaddtype
working-directory: quaddtype
run: |
LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug -Dsleef_path=/usr"
- name: Run quaddtype tests
working-directory: quaddtype
run: |
13 changes: 8 additions & 5 deletions quaddtype/meson.build
Original file line number Diff line number Diff line change
@@ -25,16 +25,18 @@ if is_windows
sleef_dep = declare_dependency(include_directories: include_directories(sleef_include_dir),
dependencies: [sleef_lib, sleefquad_lib])
else
# Linux and macOS configuration
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
sleef_path = get_option('sleef_path')
if sleef_path == ''
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
endif
if sleef_path == ''
sleef_path = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: false).stdout().strip()
endif
if sleef_path == ''
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set')
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set, and sleef_path option is not provided')
endif

add_project_link_arguments('-L' + sleef_path + '/lib', language: ['c', 'cpp'])
message('Using SLEEF path: ' + sleef_path)

sleef_include_dir = sleef_path + '/include'
sleef_library_dir = sleef_path + '/lib'
@@ -47,9 +49,10 @@ else
endif

if not sleef_dep.found() or (not is_windows and not sleefquad_dep.found())
error('SLEEF library not found. Please ensure it is installed in your conda environment.')
error('SLEEF library not found. Please ensure it is installed in your conda environment or specify the correct path.')
endif


# Try to get NumPy include path from environment variable first
if incdir_numpy == ''
incdir_numpy = run_command(py,