Commit3bdfb5c

committed

Docker: Optimise cmake build commands

Introduces cmake parallel buildSeeleejet#852

1 parent856f621 commit3bdfb5cCopy full SHA for 3bdfb5c

File tree

-11

lines changed

-11

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,8 @@ ENV PATH="/opt/rocm/lib/llvm/bin:$PATH"`
`12`	`12`
`13`	`13`	`WORKDIR /sd.cpp`
`14`	`14`	`COPY . .`
`15`		`-`
`16`	`15`	`ARG GFX_NAME`
`17`		`-RUN mkdir -p build \`
`18`		`- && cd build \`
`19`		`- && cmake .. \`
	`16`	`+RUN cmake . -B ./build \`
`20`	`17`	`-G "Ninja" \`
`21`	`18`	`-DCMAKE_C_COMPILER=clang \`
`22`	`19`	`-DCMAKE_CXX_COMPILER=clang++ \`
`@@ -25,8 +22,8 @@ RUN mkdir -p build \`
`25`	`22`	`-DGPU_TARGETS=$GFX_NAME \`
`26`	`23`	`-DAMDGPU_TARGETS=$GFX_NAME \`
`27`	`24`	`-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \`
`28`		`- -DCMAKE_POSITION_INDEPENDENT_CODE=ON \`
`29`		`- &&cmake --build . --config Release`
	`25`	`+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON`
	`26`	`+RUNcmake --build ./build --config Release --parallel`
`30`	`27`
`31`	`28`	`FROM rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete AS runtime`
`32`	`29`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ ENV VK_LAYER_PATH="/vulkansdk/x86_64/share/vulkan/explicit_layer.d"`
`17`	`17`
`18`	`18`	`WORKDIR /sd.cpp`
`19`	`19`	`COPY . .`
`20`		`-RUN mkdir -p build \`
`21`		`- && cd build \`
`22`		`- && cmake .. -DSD_VULKAN=ON \`
`23`		`- && cmake --build . --config Release`
	`20`	`+RUN cmake . -B ./build -DSD_VULKAN=ON`
	`21`	`+RUN cmake --build ./build --config Release --parallel`
`24`	`22`
`25`	`23`	`FROM debian:trixie-slim AS runtime`
`26`	`24`
`27`		`-RUN apt-get update && apt-get install -y mesa-vulkan-drivers vulkan-tools libgomp1`
	`25`	`+RUN apt-get update \`
	`26`	`+ && apt-get install -y mesa-vulkan-drivers vulkan-tools libgomp1 \`
	`27`	`+ && apt-get clean`
`28`	`28`
`29`	`29`	`COPY --from=build /sd.cpp/build/bin/sd /sd`
`30`	`30`

Comments

(0)