Commit 6f401635 authored by Philipp Fensch's avatar Philipp Fensch Committed by Markus Mirz
Browse files

Added gnuplot to centos-container, removed metrics container


Signed-off-by: Philipp Fensch's avatarPhilipp Fensch <philipp.fensch@rwth-aachen.de>
parent 9e828a44
......@@ -52,17 +52,6 @@ docker:centos:
- shell
- linux
docker:metrics:
stage: prepare
needs: []
script:
- docker build
--file Packaging/Docker/Dockerfile.metrics
--tag ${DOCKER_IMAGE_DEV}-metrics:${DOCKER_TAG} .
tags:
- shell
- linux
build:linux:
stage: build
needs: ["docker:fedora"]
......@@ -606,7 +595,7 @@ generate:metrics:
script:
- echo "set terminal svg size 800, 500; set output 'metrics.svg'; set title 'Speed of different Solver-Configurations'; set style data lines; set key outside; set xlabel \"Copies (WSCC-9bus Example)\"; set ylabel \"Average steptime (µs)\"; set xtics 1; set xtics nomirror; set ytics nomirror; set grid; plot \"cpu-dense-metrics.txt\" using (\$1 * 1000000) title \"Solving with CPU and dense matrices\", \"gpu-dense-metrics.txt\" using (\$1 * 1000000) title \"Solving with GPU and dense matrices\", \"cpu-sparse-metrics.txt\" using (\$1 * 1000000) title \"Solving with CPU and sparse matrices\"" > script.p
- gnuplot script.p
image: ${DOCKER_IMAGE_DEV}-metrics:${DOCKER_TAG}
image: ${DOCKER_IMAGE_DEV}-centos:${DOCKER_TAG}
artifacts:
reports:
metrics: metrics.svg
......
......@@ -78,7 +78,8 @@ RUN dnf -y install \
RUN dnf -y install \
graphviz \
libasan \
cppcheck
cppcheck \
gnuplot
RUN pip3 install gprof2dot
# Install CIMpp
......
FROM fedora:32
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Philipp Fensch" \
org.label-schema.author.email = "philipp.fensch@rwth-aachen.de" \
org.label-schema.url = "http://fein-aachen.org/projects/dpsim/" \
org.label-schema.vcs-url = "https://git.rwth-aachen.de/acs/public/simulation/dpsim"
RUN dnf -y update
# Required packages
RUN dnf --refresh -y install \
git \
gnuplot
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment