Skip to content
2 changes: 1 addition & 1 deletion .github/workflows/root-ci-config/build_root.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# the target branch in the ROOT repository using base_ref and head_ref:
# - The base_ref is e.g. "master" or "v6-38-00-patches"
# - The head_ref for PRs is formatted as <PR branch>:<Fork branch> e.g. "refs/pull/20742/head:cppyy_fixup"
if not ":" in args.head_ref:

Check failure on line 62 in .github/workflows/root-ci-config/build_root.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (E713)

.github/workflows/root-ci-config/build_root.py:62:16: E713 Test for membership should be `not in` help: Convert to `not in`
build_utils.print_error(f"This has been identified as a PR build. However, the head-ref is {args.head_ref}.")
branch_in_fork = args.head_ref.split(":")[-1]
if branch_in_fork == args.base_ref:
Expand All @@ -85,7 +85,7 @@

if "minimal" in platform_options and platform_options["minimal"] == "ON":
options_dict = platform_options
print(f"Minimal build detected in the platform options. Ignoring global configuration.")

Check failure on line 88 in .github/workflows/root-ci-config/build_root.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (F541)

.github/workflows/root-ci-config/build_root.py:88:15: F541 f-string without any placeholders help: Remove extraneous `f` prefix
else:
options_dict.update(platform_options)
print(f"Build option overrides for {args.platform_config}:")
Expand Down Expand Up @@ -362,7 +362,7 @@
ctest_result = subprocess_with_log(f"""
cd '{builddir}'
{setupROOTEnv}
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ builtin_xxhash=ON
builtin_zeromq=ON
builtin_zstd=ON
cocoa=ON
fortran=OFF
minuit2_omp=OFF
r=OFF
test_distrdf_dask=OFF
Expand Down
6 changes: 1 addition & 5 deletions hist/hbook/src/THbookFile.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,7 @@ static Int_t gLastEntry = -1;

// As recommended in
// https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html
#if __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
#endif
using fortran_charlen_t = size_t;

#else
# define hlimit HLIMIT
Expand Down
1 change: 0 additions & 1 deletion main/CMakeLists.txt
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
10 changes: 3 additions & 7 deletions misc/minicern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
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 "-Wall -Wextra")
# 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
934 changes: 146 additions & 788 deletions misc/minicern/src/hbook.f

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions misc/minicern/src/hcflag.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
C=== hcflag.inc ================================================
INTEGER ID,IDBADD,LID,IDLAST,IDHOLD,NBIT,NBITCH,
+ NCHAR,NRHIST,IERR,NV
COMMON /HCFLAG/ ID,IDBADD,LID,IDLAST,IDHOLD,NBIT,NBITCH,
+ NCHAR,NRHIST,IERR ,NV
15 changes: 8 additions & 7 deletions misc/minicern/src/kernlib.f
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ SUBROUTINE SBIT0 (IZW,IZP)
*-------------------------------------------------------------------------------

SUBROUTINE UCTOH (MS,MT,NPW,NCH)
CHARACTER MS*99
DIMENSION MT(99)
CHARACTER MS*(*)
DIMENSION MT(NPW)
PARAMETER (NBITPW=32)
PARAMETER (NCHAPW=4)
CHARACTER CHWORD*(NCHAPW)
Expand Down Expand Up @@ -244,7 +244,7 @@ SUBROUTINE UCTOH (MS,MT,NPW,NCH)

SUBROUTINE UHTOC (MS,NPW,MT,NCH)
DIMENSION MS(99)
CHARACTER MT*99
CHARACTER MT*128
PARAMETER (NCHAPW=4)
CHARACTER CHWORD*(NCHAPW)
INTEGER IWORD
Expand Down Expand Up @@ -310,14 +310,15 @@ SUBROUTINE UCTOH1 (MS,MT,NCH)
SUBROUTINE UCOPYI (IA,IB,N)
DIMENSION IA(*),IB(*)
IF (N.EQ.0) RETURN
DO 21 I=1,N
21 IB(I)=IA(I)
DO 21 I=1,N
21 IB(I) = IA(I)
END

SUBROUTINE UCOPY (A,B,N)
DIMENSION A(*),B(*)
IF (N.EQ.0) RETURN
DO 21 I=1,N
21 B(I)=A(I)
DO 21 I=1,N
21 B(I) = A(I)
END

*-------------------------------------------------------------------------------
Expand Down
12 changes: 12 additions & 0 deletions misc/minicern/src/param1.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
C=== param1.inc ================================================
INTEGER ZBITS, ZNDIM, ZNOENT, ZNPRIM, ZNRZB, ZIFCON,
+ ZIFNAM, ZIFCHA, ZIFINT, ZIFREA, ZNWTIT, ZITIT1,
+ ZNCHRZ, ZDESC, ZLNAME, ZNAME, ZARIND, ZRANGE, ZNADDR,
+ ZIBLOK, ZNBLOK, ZLCONT, ZIFBIT, ZIBANK, ZIFTMP, ZITMP,
+ ZID, ZNTMP, ZNTMP1, ZLINK
PARAMETER(ZBITS=1, ZNDIM=2, ZNOENT=3, ZNPRIM=4, ZLCONT=6,
+ ZNRZB=5, ZIFCON=7, ZIFNAM=4, ZIFCHA=5, ZIFINT=6,
+ ZIFREA=7, ZNWTIT=8, ZITIT1=9, ZNCHRZ=13, ZIFBIT=8,
+ ZDESC=1, ZLNAME=2, ZNAME=3, ZRANGE=4, ZNADDR=12,
+ ZARIND=11, ZIBLOK=8, ZNBLOK=10, ZIBANK=9, ZIFTMP=11,
+ ZID=12, ZITMP=10, ZNTMP=6, ZNTMP1=3, ZLINK=6)
9 changes: 9 additions & 0 deletions misc/minicern/src/param2.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
C=== param2.inc ================================================
INTEGER KNCX ,KXMIN ,KXMAX ,KMIN1 ,KMAX1 ,KNORM , KTIT1,
+ KNCY ,KYMIN ,KYMAX ,KMIN2 ,KMAX2 ,KSCAL2 , KTIT2,
+ KNBIT ,KNOENT ,KSTAT1 ,KNSDIR ,KNRH ,
+ KCON1 ,KCON2 ,KBITS ,KNTOT
PARAMETER(KNCX=3,KXMIN=4,KXMAX=5,KMIN1=7,KMAX1=8,KNORM=9,KTIT1=10,
+ KNCY=7,KYMIN=8,KYMAX=9,KMIN2=6,KMAX2=10,KSCAL2=11,
+ KTIT2=12,KNBIT=1,KNOENT=2,KSTAT1=3,KNSDIR=5,KNRH=6,
+ KCON1=9,KCON2=3,KBITS=1,KNTOT=2)
4 changes: 4 additions & 0 deletions misc/minicern/src/pawc.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
C=== pawc.inc ==================================================
INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,IFENCE,LMAIN,IPAW
COMMON /PAWC/ NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,IFENCE(5),LMAIN,
+ IPAW(4000000-11)
3 changes: 3 additions & 0 deletions misc/minicern/src/quest.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
C=== quest.inc =================================================
INTEGER IQUEST
COMMON /QUEST/ IQUEST(100)
Loading
Loading