Skip to content

[build] Update UNURAN to 1.11.0 #18747

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/root-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,36 +363,36 @@ jobs:
include:
- image: fedora41
- image: fedora42
overrides: ["CMAKE_CXX_STANDARD=23"]
overrides: ["CMAKE_CXX_STANDARD=23","builtin_unuran=ON"]
- image: alma8
- image: alma9
overrides: ["CMAKE_BUILD_TYPE=Debug"]
overrides: ["CMAKE_BUILD_TYPE=Debug","builtin_unuran=ON"]
- image: ubuntu22
overrides: ["imt=Off", "CMAKE_BUILD_TYPE=Debug"]
overrides: ["imt=Off", "CMAKE_BUILD_TYPE=Debug","builtin_unuran=ON"]
- image: ubuntu2404
overrides: ["CMAKE_BUILD_TYPE=Debug"]
overrides: ["CMAKE_BUILD_TYPE=Debug","builtin_unuran=ON"]
- image: ubuntu2504
overrides: ["CMAKE_CXX_STANDARD=23"]
overrides: ["CMAKE_CXX_STANDARD=23","builtin_unuran=ON"]
- image: debian125
overrides: ["CMAKE_CXX_STANDARD=20", "dev=ON"]
overrides: ["CMAKE_CXX_STANDARD=20", "dev=ON","builtin_unuran=ON"]
# Special builds
- image: alma9
is_special: true
property: modules_off
overrides: ["runtime_cxxmodules=Off"]
overrides: ["runtime_cxxmodules=Off","builtin_unuran=ON"]
- image: alma9
is_special: true
property: march_native
overrides: ["CMAKE_BUILD_TYPE=RelWithDebInfo", "CMAKE_CXX_FLAGS=-march=native", "CMAKE_C_FLAGS=-march=native", "fortran=OFF"]
- image: alma9
is_special: true
property: arm64
overrides: ["CMAKE_BUILD_TYPE=RelWithDebInfo"]
overrides: ["CMAKE_BUILD_TYPE=RelWithDebInfo","builtin_unuran=ON"]
architecture: ARM64
- image: alma9-clang
is_special: true
property: clang
overrides: ["CMAKE_C_COMPILER=clang", "CMAKE_CXX_COMPILER=clang++"]
overrides: ["CMAKE_C_COMPILER=clang", "CMAKE_CXX_COMPILER=clang++","builtin_unuran=ON"]
- image: alma10
is_special: true
# Disable GPU builds until the DNS problem is solved
Expand Down
8 changes: 4 additions & 4 deletions math/unuran/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
if(builtin_unuran)

set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(UNR_VERSION "1.8.0-root")
set(UNR_VERSION "1.11.0")
set(UNR_TARNAME "unuran-${UNR_VERSION}")
set(UNR_TARGZFILE ${UNR_SRCDIR}/${UNR_TARNAME}.tar.gz)
set(UNR_TARFILE ${UNR_SRCDIR}/${UNR_TARNAME}.tar)
Expand All @@ -23,10 +23,10 @@ set(UNR_UNTARDIR ${CMAKE_CURRENT_BINARY_DIR}/${UNR_TARNAME})
if(NOT EXISTS ${UNR_UNTARDIR})
execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${UNR_TARGZFILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
# This is necessary to replace the config.guess of unuran 1.8.0 as it does not allow to compile the
# This is necessary to replace the config.guess of unuran 1.11.0 as it does not allow to compile the
# package on arm64.
execute_process( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/config.guess_patch1 ${UNR_UNTARDIR}/autoconf/config.guess
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
# execute_process( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/config.guess_patch1 ${UNR_UNTARDIR}/autoconf/config.guess
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
endif()

if(WIN32)
Expand Down
Binary file added math/unuran/src/unuran-1.11.0.tar.gz
Binary file not shown.
Binary file removed math/unuran/src/unuran-1.8.0-root.tar.gz
Binary file not shown.
Loading