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

Don't set build and clean rules for SUNDIALS if external libs are used #3054

Merged
merged 1 commit into from
Apr 26, 2024

Conversation

andrjohns
Copy link
Collaborator

Summary

When using an external SUNDIALS library via the SUNDIALS_TARGETS variable added in #2861, Stan will still try to delete the library files when calling make clean-all.

With make/local:

SUNDIALS = $(SUNDIALS_ROOT)
SUNDIALS_TARGETS = $(SUNDIALS_ROOT)/lib64/libsundials_nvecserial.a \
                    $(SUNDIALS_ROOT)/lib64/libsundials_cvodes.a \
                    $(SUNDIALS_ROOT)/lib64/libsundials_idas.a \
                    $(SUNDIALS_ROOT)/lib64/libsundials_kinsol.a

Gives clean-all behaviour:

[johnsoa2@login3 cmdstan-2.34.1]$ make clean-all
rm -f -r test
rm -f 
rm -f 
rm -f 
rm -f 
  removing dependency files
rm -f    
rm -f   
rm -f   
  cleaning sundials targets
rm -f /share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_cvodes.a /share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_idas.a /share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_kinsol.a /share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_nvecserial.a
rm: cannot remove ‘/share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_cvodes.a’: Permission denied
rm: cannot remove ‘/share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_idas.a’: Permission denied
rm: cannot remove ‘/share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_kinsol.a’: Permission denied
rm: cannot remove ‘/share/apps/scibuilder-spack/aalto-centos7/2023-01/software/linux-centos7-haswell/gcc-11.3.0/sundials-6.1.1-z5ytfe2/lib64/libsundials_nvecserial.a’: Permission denied
make: *** [clean-sundials] Error 1

This PR simply wraps the SUNDIALS build and clean rules in an ifndef, so that they are ignored when SUNDIALS_TARGETS is specified

Tests

N/A

Side Effects

N/A

Release notes

Fixed clean-all error when using external SUNDIALS libraries

Checklist

  • Copyright holder: Andrew Johnson

    The copyright holder is typically you or your assignee, such as a university or company. By submitting this pull request, the copyright holder is agreeing to the license the submitted work under the following licenses:
    - Code: BSD 3-clause (https://opensource.org/licenses/BSD-3-Clause)
    - Documentation: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

  • the basic tests are passing

    • unit tests pass (to run, use: ./runTests.py test/unit)
    • header checks pass, (make test-headers)
    • dependencies checks pass, (make test-math-dependencies)
    • docs build, (make doxygen)
    • code passes the built in C++ standards checks (make cpplint)
  • the code is written in idiomatic C++ and changes are documented in the doxygen

  • the new changes are tested

@stan-buildbot
Copy link
Contributor


Name Old Result New Result Ratio Performance change( 1 - new / old )
arma/arma.stan 0.19 0.18 1.05 4.55% faster
low_dim_corr_gauss/low_dim_corr_gauss.stan 0.01 0.01 1.02 1.5% faster
gp_regr/gen_gp_data.stan 0.02 0.02 1.07 6.34% faster
gp_regr/gp_regr.stan 0.11 0.1 1.05 4.71% faster
sir/sir.stan 79.36 76.37 1.04 3.78% faster
irt_2pl/irt_2pl.stan 3.75 3.97 0.94 -5.91% slower
eight_schools/eight_schools.stan 0.05 0.05 0.97 -3.03% slower
pkpd/sim_one_comp_mm_elim_abs.stan 0.24 0.25 0.97 -3.28% slower
pkpd/one_comp_mm_elim_abs.stan 17.94 18.39 0.98 -2.53% slower
garch/garch.stan 0.46 0.49 0.94 -6.8% slower
low_dim_gauss_mix/low_dim_gauss_mix.stan 2.78 2.83 0.98 -2.04% slower
arK/arK.stan 1.63 1.66 0.99 -1.49% slower
gp_pois_regr/gp_pois_regr.stan 2.5 2.59 0.96 -3.86% slower
low_dim_gauss_mix_collapse/low_dim_gauss_mix_collapse.stan 9.12 9.23 0.99 -1.22% slower
performance.compilation 174.42 174.34 1.0 0.05% faster
Mean result: 0.9953760796350358

Jenkins Console Log
Blue Ocean
Commit hash: 13017193216fe150e9a8fadbc7b3f9cb71f8a58d


Machine information No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.3 LTS Release: 20.04 Codename: focal

CPU:
Architecture: x86_64
CPU op-mode(s): 32-bit, 64-bit
Byte Order: Little Endian
Address sizes: 46 bits physical, 48 bits virtual
CPU(s): 80
On-line CPU(s) list: 0-79
Thread(s) per core: 2
Core(s) per socket: 20
Socket(s): 2
NUMA node(s): 2
Vendor ID: GenuineIntel
CPU family: 6
Model: 85
Model name: Intel(R) Xeon(R) Gold 6148 CPU @ 2.40GHz
Stepping: 4
CPU MHz: 1165.746
CPU max MHz: 3700.0000
CPU min MHz: 1000.0000
BogoMIPS: 4800.00
Virtualization: VT-x
L1d cache: 1.3 MiB
L1i cache: 1.3 MiB
L2 cache: 40 MiB
L3 cache: 55 MiB
NUMA node0 CPU(s): 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78
NUMA node1 CPU(s): 1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59,61,63,65,67,69,71,73,75,77,79
Vulnerability Gather data sampling: Mitigation; Microcode
Vulnerability Itlb multihit: KVM: Mitigation: VMX disabled
Vulnerability L1tf: Mitigation; PTE Inversion; VMX conditional cache flushes, SMT vulnerable
Vulnerability Mds: Mitigation; Clear CPU buffers; SMT vulnerable
Vulnerability Meltdown: Mitigation; PTI
Vulnerability Mmio stale data: Mitigation; Clear CPU buffers; SMT vulnerable
Vulnerability Retbleed: Mitigation; IBRS
Vulnerability Spec rstack overflow: Not affected
Vulnerability Spec store bypass: Mitigation; Speculative Store Bypass disabled via prctl
Vulnerability Spectre v1: Mitigation; usercopy/swapgs barriers and __user pointer sanitization
Vulnerability Spectre v2: Mitigation; IBRS, IBPB conditional, STIBP conditional, RSB filling, PBRSB-eIBRS Not affected
Vulnerability Srbds: Not affected
Vulnerability Tsx async abort: Mitigation; Clear CPU buffers; SMT vulnerable
Flags: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb cat_l3 cdp_l3 invpcid_single pti intel_ppin ssbd mba ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm mpx rdt_a avx512f avx512dq rdseed adx smap clflushopt clwb intel_pt avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts hwp hwp_act_window hwp_epp hwp_pkg_req pku ospke md_clear flush_l1d arch_capabilities

G++:
g++ (Ubuntu 9.4.0-1ubuntu1~20.04) 9.4.0
Copyright (C) 2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Clang:
clang version 10.0.0-4ubuntu1
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/bin

Copy link
Member

@WardBrian WardBrian left a comment

Choose a reason for hiding this comment

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

LGTM!

It still bothers me that we have different names for this than TBB (which uses only TBB_INC and TBB_LIB)

@WardBrian WardBrian merged commit e73651b into develop Apr 26, 2024
8 checks passed
@WardBrian WardBrian deleted the sundials-targets branch April 26, 2024 13:46
@andrjohns
Copy link
Collaborator Author

LGTM!

It still bothers me that we have different names for this than TBB (which uses only TBB_INC and TBB_LIB)

Yeah, agreed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants