diff --git a/cpp/Dockerfile b/cpp/Dockerfile index e99d9d1..55cdeb2 100644 --- a/cpp/Dockerfile +++ b/cpp/Dockerfile @@ -1,15 +1,15 @@ -FROM nvidia/cuda:12.4.1-devel-ubi9 as builder +FROM nvidia/cuda:12.5.0-devel-ubi9 as builder WORKDIR /home/ViolaJones/cpp COPY *.cu *.cpp *.hpp Makefile ./ RUN make -j "$(nproc)" -FROM nvidia/cuda:12.4.1-base-ubi9 +FROM nvidia/cuda:12.5.0-base-ubi9 WORKDIR /home/ViolaJones/cpp -RUN dnf install -y make-1:4.3-7.el9 && dnf clean all +RUN dnf install -y make-1:4.3-8.el9 && dnf clean all COPY --from=builder /home/ViolaJones/cpp/bin ./bin COPY --from=builder /home/ViolaJones/cpp/Makefile . diff --git a/cpp/Makefile b/cpp/Makefile index cef2b6f..94be551 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -8,7 +8,7 @@ DATA_PATH := ../data #CFLAGS := -O0 -g -G -pg -Xptxas=-w -Xcompiler -O0,-rdynamic,-g CFLAGS := -dlto -O2 -Xcompiler -O2 #CFLAGS := -dlto -O2 -g -Xcompiler -O2,-g,-ggdb -CFLAGS := $(CFLAGS) -MMD -MP -Werror=all-warnings -Xcompiler -Wall,-Werror,-Werror=implicit-fallthrough=0,-Wextra +CFLAGS := $(CFLAGS) -MMD -MP -Werror=all-warnings -Xcompiler -Wall,-Werror,-Wextra EXEC := $(OBJ_DIR)/ViolaJones DATA := $(DATA_PATH)/X_train.bin $(DATA_PATH)/X_test.bin $(DATA_PATH)/y_train.bin $(DATA_PATH)/y_test.bin SRC := $(shell find $(SRC_DIR) -name '*.cpp' -o -name '*.cu') @@ -88,9 +88,7 @@ log: $(DATA) reset .PHONY: reset reset: @echo 'Deleting generated states and models' - @rm -frv $(OUT_DIR)/* $(MODELS_DIR)/* -#@ln -sv /mnt/pierre_stuffs/ViolaJones/cpp/models . -#@ln -sv /mnt/pierre_stuffs/ViolaJones/cpp/out . + @rm -frv $(OUT_DIR) $(MODELS_DIR) .PHONY: clean clean: diff --git a/downloader/Dockerfile b/downloader/Dockerfile index 4d80350..f3e8e79 100644 --- a/downloader/Dockerfile +++ b/downloader/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.19.1 +FROM alpine:3.20.0 -RUN apk add --no-cache curl=8.5.0-r0 python3=3.11.9-r0 && rm -rf /var/cache/apk* +RUN apk add --no-cache curl=8.7.1-r0 python3=3.12.3-r1 && rm -rf /var/cache/apk* WORKDIR /home/ViolaJones/downloader COPY requirements.txt activate.sh ./ diff --git a/python/Dockerfile b/python/Dockerfile index a7cd52d..b36a178 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -1,7 +1,8 @@ -FROM nvidia/cuda:12.4.1-devel-ubi9 as builder +FROM nvidia/cuda:12.5.0-devel-ubi9 as builder -RUN dnf install -y python3.11-3.11.5-1.el9_3 && dnf clean all -RUN ln -s /usr/bin/python3 /usr/bin/python +RUN dnf install -y python3.11-3.11.7-1.el9 \ + && dnf clean all \ + && ln -s /usr/bin/python3 /usr/bin/python WORKDIR /home/ViolaJones/python COPY Makefile activate.sh requirements.txt ./