Skip to content

Commit 506c99b

Browse files
authored
Merge pull request #1837 from CEED/jed/ci-noether-cuda-12.9
* ci: noether CUDA_DIR=/usr/local/cuda-12.9 * makefiles: update defaults from c99 to c11 * tidy: -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling * ci: noether rocm-6.3
2 parents d538d16 + f423952 commit 506c99b

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Checks: "clang-diagnostic-*,clang-analyzer-*,readability-inconsistent-declaration-parameter-name,bugprone-too-small-loop-variable"
1+
Checks: "clang-diagnostic-*,clang-analyzer-*,readability-inconsistent-declaration-parameter-name,bugprone-too-small-loop-variable,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling"
22
HeaderFilterRegex: .*
33
WarningsAsErrors: "clang-diagnostic-*,clang-analyzer-*,readability-inconsistent-declaration-parameter-name"

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ noether-cuda:
196196
script:
197197
- rm -f .SUCCESS
198198
# libCEED
199-
- make configure OPT='-O -march=native -ffp-contract=fast' CUDA_DIR=/usr
199+
- make configure OPT='-O -march=native -ffp-contract=fast' CUDA_DIR=/usr/local/cuda-12.9
200200
- echo "-------------- libCEED -------------" && make info
201201
- BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
202202
- echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
@@ -280,7 +280,7 @@ noether-cuda:
280280
# script:
281281
# - rm -f .SUCCESS
282282
# # libCEED
283-
# - make configure ROCM_DIR=/opt/rocm-6.1.0 OPT='-O -march=native -ffp-contract=fast'
283+
# - make configure ROCM_DIR=/opt/rocm-6.3.0 OPT='-O -march=native -ffp-contract=fast'
284284
# - BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
285285
# - echo "-------------- libCEED -------------" && make info
286286
# - echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
@@ -342,7 +342,7 @@ noether-rocm:
342342
script:
343343
- rm -f .SUCCESS
344344
# libCEED
345-
- make configure ROCM_DIR=/opt/rocm-6.1.0 OPT='-O -march=native -ffp-contract=fast'
345+
- make configure ROCM_DIR=/opt/rocm-6.3.0 OPT='-O -march=native -ffp-contract=fast'
346346
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
347347
- echo "-------------- libCEED -------------" && make info
348348
- echo "-------------- BACKENDS_GPU --------" && echo $BACKENDS_GPU
@@ -388,7 +388,7 @@ noether-float:
388388
# Change to single precision
389389
- sed -i 's/ceed-f64/ceed-f32/1' include/ceed/types.h
390390
# Build libCEED
391-
- make configure OPT='-O -march=native -ffp-contract=fast' CUDA_DIR=/usr
391+
- make configure OPT='-O -march=native -ffp-contract=fast' CUDA_DIR=/usr/local/cuda-12.9
392392
- BACKENDS_CPU=$(make info-backends-all | grep -o '/cpu[^ ]*' | tr '\n' ' ') && BACKENDS_GPU=$(make info-backends | grep -o '/gpu[^ ]*' | tr '\n' ' ')
393393
- echo "-------------- libCEED -------------" && make info
394394
- echo "-------------- BACKENDS_CPU --------" && echo $BACKENDS_CPU

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ OPT.clang := $(OPT.gcc)
134134
OPT.icc := $(OPT.gcc)
135135
OPT.oneAPI := $(OPT.clang)
136136
OPT.emcc :=
137-
CFLAGS.gcc := $(if $(STATIC),,-fPIC) -std=c99 -Wall -Wextra -Wno-unused-parameter -MMD -MP
137+
CFLAGS.gcc := $(if $(STATIC),,-fPIC) -std=c11 -Wall -Wextra -Wno-unused-parameter -MMD -MP
138138
CFLAGS.clang := $(CFLAGS.gcc)
139139
CFLAGS.icc := $(CFLAGS.gcc)
140140
CFLAGS.oneAPI := $(CFLAGS.clang)
@@ -958,7 +958,7 @@ vermin :
958958
CLANG_TIDY ?= clang-tidy
959959

960960
%.c.tidy : %.c
961-
$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c99 -I$(CUDA_DIR)/include -I$(ROCM_DIR)/include -DCEED_JIT_SOURCE_ROOT_DEFAULT="\"$(abspath ./include)/\"" -DCEED_GIT_VERSION="\"$(GIT_DESCRIBE)\"" -DCEED_BUILD_CONFIGURATION="\"// Build Configuration:$(foreach v,$(CONFIG_VARS),\n$(v) = $($(v)))\""
961+
$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c11 -I$(CUDA_DIR)/include -I$(ROCM_DIR)/include -DCEED_JIT_SOURCE_ROOT_DEFAULT="\"$(abspath ./include)/\"" -DCEED_GIT_VERSION="\"$(GIT_DESCRIBE)\"" -DCEED_BUILD_CONFIGURATION="\"// Build Configuration:$(foreach v,$(CONFIG_VARS),\n$(v) = $($(v)))\""
962962

963963
%.cpp.tidy : %.cpp
964964
$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c++11 -I$(CUDA_DIR)/include -I$(OCCA_DIR)/include -I$(ROCM_DIR)/include

examples/ceed/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ OPT ?= -O -g
99

1010
# Ceed directory
1111
CEED_DIR ?= ../..
12-
CEED_FLAGS ?= -I$(CEED_DIR)/include -std=c99 $(OPT)
12+
CEED_FLAGS ?= -I$(CEED_DIR)/include -std=c11 $(OPT)
1313
CEED_LIBS ?= -Wl,-rpath,$(abspath $(CEED_DIR)/lib) -L$(CEED_DIR)/lib -lceed -lm
1414

1515
EXAMPLES.c = $(wildcard ex*.c)

examples/fluids/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CEED_DIR ?= ../..
2424
ceed.pc := $(CEED_DIR)/lib/pkgconfig/ceed.pc
2525

2626
CC = $(call pkgconf, --variable=ccompiler $(PETSc.pc) $(ceed.pc))
27-
CFLAGS = -std=c99 \
27+
CFLAGS = -std=c11 \
2828
$(call pkgconf, --variable=cflags_extra $(PETSc.pc)) \
2929
$(call pkgconf, --cflags-only-other $(PETSc.pc)) \
3030
$(OPT) $(OPT_EXAMPLES)

examples/petsc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CEED_DIR ?= ../..
1515
ceed.pc := $(CEED_DIR)/lib/pkgconfig/ceed.pc
1616

1717
CC = $(call pkgconf, --variable=ccompiler $(PETSc.pc) $(ceed.pc))
18-
CFLAGS = -std=c99 \
18+
CFLAGS = -std=c11 \
1919
$(call pkgconf, --variable=cflags_extra $(PETSc.pc)) \
2020
$(call pkgconf, --cflags-only-other $(PETSc.pc)) \
2121
$(OPT)

examples/python/setup_qfunctions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Compiler arguments
1818
extra_compile_args = []
1919
if platform == "linux" or platform == "linux2" or platform == "darwin":
20-
extra_compile_args = ["-O3", "-march=native", "-std=c99"]
20+
extra_compile_args = ["-O3", "-march=native", "-std=c11"]
2121

2222
# Define the extension module
2323
qfunctions = Extension("libceed_c_qfunctions",

examples/solids/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CEED_DIR ?= ../..
1515
ceed.pc := $(CEED_DIR)/lib/pkgconfig/ceed.pc
1616

1717
CC = $(call pkgconf, --variable=ccompiler $(PETSc.pc) $(ceed.pc))
18-
CFLAGS = -std=c99 \
18+
CFLAGS = -std=c11 \
1919
$(call pkgconf, --variable=cflags_extra $(PETSc.pc)) \
2020
$(call pkgconf, --cflags-only-other $(PETSc.pc)) \
2121
$(OPT)

python/tests/setup-qfunctions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
qf_module = Extension("libceed_qfunctions",
1717
include_dirs=[os.path.join(CEED_DIR, 'include')],
1818
sources=["libceed-qfunctions.c"],
19-
extra_compile_args=["-O3", "-std=c99",
19+
extra_compile_args=["-O3", "-std=c11",
2020
"-Wno-unused-variable",
2121
"-Wno-unused-function"])
2222

0 commit comments

Comments
 (0)