Skip to content

[CI] fast H2rootcheck v2 #20547

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

Closed
guitargeek wants to merge 9 commits into from
Closed

[CI] fast H2rootcheck v2 #20547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e0e21fd
REVERTME only run h2root test
ferdymercury Nov 26, 2025
b7f831d
[minicern] reenable optimizations
ferdymercury Nov 26, 2025
85038d8
[CI] enable fortran on mac14
ferdymercury Nov 26, 2025
7ac87c9
[h2root] unsilence fortran warnings
ferdymercury Nov 26, 2025
db6b68b
[minicern] unsilence fortran warnings
ferdymercury Nov 26, 2025
0a70b31
[minicern] show asan warnings
ferdymercury Nov 26, 2025
6202227
[minicern] zebra.f asan issue still there
ferdymercury Nov 26, 2025
747c5ba
[h2root] random attempt to fix mac15 failure
ferdymercury Nov 26, 2025
16ec358
[hbook] Try to make HRFILE subroutine safer
guitargeek Nov 27, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/root-ci-config/build_root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def run_ctest(extra_ctest_flags: str) -> int:
builddir = os.path.join(WORKDIR, "build")
ctest_result = subprocess_with_log(f"""
cd '{builddir}'
ctest --output-on-failure --parallel {os.cpu_count()} --output-junit TestResults.xml {extra_ctest_flags}
ctest -R "roottest-root-hist-h2root" --output-on-failure --parallel {os.cpu_count()} --output-junit TestResults.xml {extra_ctest_flags}
""")

return ctest_result
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/root-ci-config/buildconfig/mac14.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ builtin_xxhash=ON
builtin_zeromq=ON
builtin_zstd=ON
cocoa=ON
fortran=OFF
minuit2_omp=OFF
test_distrdf_dask=OFF
test_distrdf_pyspark=OFF
Expand Down
1 change: 0 additions & 1 deletion main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ generateHeader(hadd

if(fortran AND CMAKE_Fortran_COMPILER)
ROOT_EXECUTABLE(g2root g2root.f LIBRARIES minicern CMAKENOEXPORT)
set_target_properties(g2root PROPERTIES COMPILE_FLAGS "-w")
ROOT_EXECUTABLE(h2root h2root.cxx LIBRARIES Core RIO Net Hist Graf Graf3d Gpad Tree Matrix MathCore Thread minicern CMAKENOEXPORT)

# This is needed in particular for macOS, where the path of the GNU Fortran
Expand Down
4 changes: 2 additions & 2 deletions main/src/h2root.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,9 @@ void convert_1d(Int_t id)
else snprintf(idname,128,"h_%d",-id);
hnoent(id,nentries);
#ifndef WIN32
hgive(id,chtitl,ncx,xmin,xmax,ncy,ymin,ymax,nwt,idb,80);
hgive(id,chtitl,ncx,xmin,xmax,ncy,ymin,ymax,nwt,idb,128);
#else
hgive(id,chtitl,80,ncx,xmin,xmax,ncy,ymin,ymax,nwt,idb);
hgive(id,chtitl,128,ncx,xmin,xmax,ncy,ymin,ymax,nwt,idb);
#endif
chtitl[4*nwt] = 0;
TH1F *h1;
Expand Down
8 changes: 2 additions & 6 deletions misc/minicern/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,5 @@ ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC)
set_property(TARGET minicern PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})

# Disable optimization since it some cases was causing crashes.
# Disable warnings, since what has worked for 40 years...
# (see https://sft.its.cern.ch/jira/browse/ROOT-9179 for the warnings)
set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-O0 -w")
# set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-fsanitize=undefined -fsanitize=address")
# target_link_options(minicern BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address)
# set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-fsanitize=undefined -fsanitize=address") # TODO enabling this shows issues
# target_link_options(minicern BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address) # TODO enabling this shows issues
23 changes: 21 additions & 2 deletions misc/minicern/src/hbook.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ SUBROUTINE HRFILE(LUN,CHDIR,CHOPT)
DIMENSION IOPT(6)
EQUIVALENCE (IOPTN,IOPT(1)),(IOPTG,IOPT(2)),(IOPTQ,IOPT(3))
EQUIVALENCE (IOPTM,IOPT(4)),(IOPTO,IOPT(5)),(IOPTE,IOPT(6))

! --- new local temporaries for safe short-character assignment
CHARACTER*16 CHTMP
INTEGER NCHR

IF(NCHTOP.GE.MXFILES)THEN
print*, 'Too many open files','HRFILE',LUN
GO TO 99
Expand Down Expand Up @@ -356,14 +361,28 @@ SUBROUTINE HRFILE(LUN,CHDIR,CHOPT)
ENDIF
IF(IQUEST(1).NE.0)RETURN
NCHTOP=NCHTOP+1
CHTOP(NCHTOP)=CHDIR

! ---- safe assignment of CHTOP(NCHTOP) from CHDIR (CHTOP is 16 chars)
CHTMP = ' '
NCHR = LEN_TRIM(CHDIR)
IF (NCHR .GT. 16) THEN
CHTMP = CHDIR(1:16)
ELSE
IF (NCHR .GT. 0) THEN
CHTMP(1:NCHR) = CHDIR(1:NCHR)
ENDIF
ENDIF
CHTOP(NCHTOP) = CHTMP

ICHLUN(NCHTOP)=0
IF(IOPTG.EQ.0)THEN
ICHTOP(NCHTOP)=LUN
ICHTYP(NCHTOP)=NWK
HFNAME(NCHTOP)=CHDIR
ELSE
ICHTOP(NCHTOP)=-LOCF(LUN)
! ---- replaced non-portable pointer storage: do NOT store LOCF() into INTEGER
! store a safe negative marker instead (unique per top index)
ICHTOP(NCHTOP) = -NCHTOP
ICHTYP(NCHTOP)=0
IF(IOPTM.EQ.0)THEN
HFNAME(NCHTOP)='Global section - '//CHDIR
Expand Down
Loading