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

REF: Reorganize windows artifacts #14

Merged
merged 16 commits into from
Dec 14, 2023
Merged

REF: Reorganize windows artifacts #14

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9e714dd
REF: Correctly distribute Windows artifacts into outputs
carterbox Dec 3, 2023
f84f3a0
REF: Move Windows static lib to static lib output
carterbox Dec 4, 2023
31aa8a8
BLD: Bump the build number
carterbox Dec 4, 2023
56bb126
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.1, and co…
carterbox Dec 4, 2023
e75a796
BUG: Move Windows DSO whitelist to follow DLL move
carterbox Dec 4, 2023
366017a
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.30.1, and co…
Dec 4, 2023
611c911
REF: No target_name subdirectory on Windows
carterbox Dec 9, 2023
90e44a2
STY: Minimize whitespace changes
carterbox Dec 9, 2023
2bd3fc6
REF: Minimize diff with upstream branch
carterbox Dec 12, 2023
c77d4ef
Update bld.bat to use environment variable
carterbox Dec 13, 2023
a4d8b3e
Update bld.bat
carterbox Dec 13, 2023
a0ae414
Disable `binary_relocation`
jakirkham Dec 13, 2023
b9e4754
Align indentation
jakirkham Dec 13, 2023
c16ebfc
Tweak list indentation
jakirkham Dec 13, 2023
6979833
Adjust selector spacing
jakirkham Dec 13, 2023
ba06b61
Lowercase `bld.bat` error check
jakirkham Dec 14, 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
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ move lib\x64\* %LIBRARY_LIB%
move bin\* %LIBRARY_BIN%
move include\cooperative_groups %LIBRARY_INC%
move include\* %LIBRARY_INC%
IF %ERRORLEVEL% NEQ 0 exit /b 1
19 changes: 11 additions & 8 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,17 @@ source:
sha256: 1cd8516feee068c6d718453e76b0dfcbee27844a35d4f3aa608a3d316190309c # [win]

build:
number: 6
number: 7
Comment on lines 26 to +27
Copy link
Member

Choose a reason for hiding this comment

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

Even though this bumped the build/number to 7, there was already a bump to 7 from PR ( #15 ), which was merged previously. As a result there was no build/number bump for this PR and packages were not published

Have manually bumped the build/number to 8 with commit ( 00246a6 ). So we should soon see new packages with the fix

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch!

skip: true # [osx]

outputs:
- name: cuda-cudart_{{ target_platform }}
build:
noarch: generic
binary_relocation: false
missing_dso_whitelist: # [win]
- "*/api-ms-win-core-libraryloader-*.dll" # [win]
- "*/api-ms-win-security-systemfunctions-*.dll" # [win]
files:
files: # [linux]
- targets/{{ target_name }}/lib/libcu*.so.* # [linux]
- Library\bin\cudart*.dll # [win]
# Windows DLLs are not needed at compile time
requirements:
build:
- {{ compiler("c") }}
Expand All @@ -54,7 +51,7 @@ outputs:
commands:
- test -L $PREFIX/targets/{{ target_name }}/lib/libcudart.so.{{ version.split(".")[0] }} # [linux]
- test -f $PREFIX/targets/{{ target_name }}/lib/libcudart.so.{{ version }} # [linux]
- if not exist %LIBRARY_BIN%\cudart64_{{ version.split(".")[0] }}.dll exit 1 # [win]
- if exist %LIBRARY_BIN%\cudart64_{{ version.split(".")[0] }}.dll exit 1 # [win]
about:
home: https://developer.nvidia.com/cuda-toolkit
license_file: LICENSE
Expand All @@ -66,8 +63,14 @@ outputs:
doc_url: https://docs.nvidia.com/cuda/index.html

- name: cuda-cudart
files: # [linux]
build:
binary_relocation: false
missing_dso_whitelist: # [win]
- "*/api-ms-win-core-libraryloader-*.dll" # [win]
- "*/api-ms-win-security-systemfunctions-*.dll" # [win]
files:
- lib/libcu*.so.* # [linux]
- Library\bin\cudart*.dll # [win]
requirements:
build:
- {{ compiler("c") }}
Expand Down