-
Notifications
You must be signed in to change notification settings - Fork 180
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
Fetch slang-llvm.so from correct release #4847
Conversation
Closes shader-slang#4648 Should close shader-slang#4812
This change appears to solve the problem on macOS that uses M3 chip, which is aarch64.
It also gives me a following error when I use it on Windows,
Note that before this PR, "cmake --preset release" worked fine with all three configurations: macOS with Intel, macOS with M3, and Windows. With this PR, "cmake --preset release" is failing on macOS with Intel and Windows. |
When I don't snooze the verbose warning messages, I got more usefull error message on Windows.
|
cmake/GitHubRelease.cmake
Outdated
endfunction() | ||
|
||
function(get_best_slang_binary_release_url out_var) | ||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing amd64
to capitalized AMD64
resolves the problem on Windows.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
fixed, feel free to merge please |
cmake/GitHubRelease.cmake
Outdated
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") | ||
set(arch "x86_64") | ||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") | ||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On Windows, it looks like the value of CMAKE_SYSTEM_PROCESSOR comes from an environment variable, "PROCESSOR_ARCHITECTURE".
https://cmake.org/cmake/help/latest/variable/CMAKE_HOST_SYSTEM_PROCESSOR.html#variable:CMAKE_HOST_SYSTEM_PROCESSOR
And it looks like the possible values are AMD64, IA64, ARM64 or x86:
https://learn.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details?redirectedfrom=MSDN
Note that ARM64 should be in capital letters.
I am not sure if x86_64 is correct or not; it may need to be x86.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't make releases for x86 so it would always fail anyway.
@jkwak-work I see this PR has been previously approved but there are more comments thereafter. |
I think it is good to merge. |
This reverts commit 579d59c.
* Fetch slang-llvm.so from correct release Closes shader-slang#4648 Should close shader-slang#4812 * Update docs * Correct documentation on cmake option * Neaten cmake script * Fix fetching on windows --------- Co-authored-by: Yong He <yonghe@outlook.com>
* Dont require llvm for building generators * Fetch slang-llvm.so from correct release (#4847) * Fetch slang-llvm.so from correct release Closes #4648 Should close #4812 * Update docs * Correct documentation on cmake option * Neaten cmake script * Fix fetching on windows --------- Co-authored-by: Yong He <yonghe@outlook.com> * Be a bit more careful dealing with release list fetching failure * clarify error messages --------- Co-authored-by: Yong He <yonghe@outlook.com>
Slang v2024.10 This release brings support for tuple types, variadic generics and depedent generic constraints. No breaking changes. Changes: e97e7e5 Revert "Fetch slang-llvm.so from correct release (shader-slang#4847)" (shader-slang#4893) 359e96c Proposal: A simpler and more flexible `IDifferentiable` system (shader-slang#4865) f9f6a28 Support dependent generic constraints. (shader-slang#4870) 03e1e17 Fix `tests\autodiff\reverse-while-loop-3.slang` test (shader-slang#4886) bcb5391 Exclude synthesized code from code auto documentation system (shader-slang#4889) 6b1b243 Track uninitialized values of `Ptr<Specialize<T>>` inside type `T` without hang (shader-slang#4885) 77e6c64 Fixes shader-slang#4879 (shader-slang#4881) 579d59c Fetch slang-llvm.so from correct release (shader-slang#4847) d286ff5 Implement Path::createDirectoryRecursive (shader-slang#4871) f77a5ac Remove using SpvStorageClass values casted into AddressSpace values (shader-slang#4861) 453683b Tuple swizzling, concat, comparison and `countof`. (shader-slang#4856) ecf85df Variadic Generics Part 2: IR lowering and specialization. (shader-slang#4849) ca5d303 Make sure to resolve overloaded expr for call args. (shader-slang#4864) 25bc5a3 Avoiding the use of the global AST builder in DeclRefType::create (shader-slang#4866) b411c05 Include inout cast operation as an aliasing instruction (shader-slang#4859) 9bf5dc9 Design proposal: IFunc interface. (shader-slang#4851) f447b74 Update documentation for #include to indicate it is for legacy code and new code should use modules (shader-slang#4862)
Closes #4648
Should close #4812