Skip to content

Commit b2393c3

Browse files
author
Claudio Bantaloukas
authored
Merge pull request #19 from ccdc-opensource/xmas_updates
Xmas updates
2 parents c84c659 + 3a35ee0 commit b2393c3

File tree

79 files changed

+5830
-5054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+5830
-5054
lines changed

.devcontainer/Dockerfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM ubuntu:20.04
2+
3+
RUN apt-get update && \
4+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
5+
curl ca-certificates gpg && \
6+
rm -rf /var/lib/apt/lists/*
7+
8+
# repository to install Intel(R) oneAPI Libraries
9+
RUN curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB | gpg --dearmor - | tee /usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg >/dev/null
10+
RUN echo "deb [signed-by=/usr/share/keyrings/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.gpg] https://apt.repos.intel.com/oneapi all main" > /etc/apt/sources.list.d/oneAPI.list
11+
12+
# repository to install up to date cmake
13+
RUN curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
14+
RUN echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main" > /etc/apt/sources.list.d/kitware.list
15+
16+
RUN apt-get update && \
17+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
18+
curl ca-certificates gpg-agent software-properties-common openssh-client \
19+
build-essential pkg-config \
20+
\
21+
git ninja-build cmake \
22+
\
23+
libx11-dev libxss-dev libxxf86vm-dev libxkbfile-dev libxv-dev libmotif-dev libxmu-dev libxinerama-dev \
24+
\
25+
intel-oneapi-compiler-fortran gfortran \
26+
&& \
27+
rm -rf /var/lib/apt/lists/*
28+
29+
ENV LANG=C.UTF-8

.devcontainer/devcontainer.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "linux environment for developing dash, works on linux hosts only due to use of X11 files",
3+
"dockerFile": "Dockerfile",
4+
"postCreateCommand": "bash .devcontainer/fetch-winteracter.sh",
5+
"extensions": [
6+
"ms-vscode.cpptools",
7+
"ms-vscode.cmake-tools",
8+
"intel-corporation.oneapi-gdb-debug",
9+
"krvajalm.linter-gfortran",
10+
"mhutchie.git-graph"
11+
],
12+
"containerEnv": {
13+
"ARTIFACTORY_API_KEY": "${localEnv:ARTIFACTORY_API_KEY}",
14+
"DISPLAY": "unix:0"
15+
},
16+
"mounts": [
17+
"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind,consistency=cached"
18+
],
19+
"runArgs": [
20+
"--cap-add=SYS_PTRACE",
21+
"--security-opt",
22+
"seccomp=unconfined"
23+
],
24+
}

.devcontainer/fetch-winteracter.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
if [[ "$ARTIFACTORY_API_KEY" != "" ]]
2+
then
3+
echo "Fething winteracter from repository"
4+
mkdir -p /opt/winteracter
5+
pushd /opt/winteracter
6+
curl -H "X-JFrog-Art-Api:$ARTIFACTORY_API_KEY" -LO "https://artifactory.ccdc.cam.ac.uk/artifactory/dash-private-dependencies/winteracter-linux-14.10d.tar.bz2"
7+
curl -H "X-JFrog-Art-Api:$ARTIFACTORY_API_KEY" -LO "https://artifactory.ccdc.cam.ac.uk/artifactory/dash-private-dependencies/xwint_rc_14_10e.tar.gz"
8+
tar jxf winteracter-linux-14.10d.tar.bz2
9+
pushd winteracter-linux-14.10d
10+
tar zxf ../xwint_rc_14_10e.tar.gz
11+
fi

.devcontainer/gdb-oneapi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# a script that can be used in the devcontainer to start intel's gdb
3+
# by setting "miDebuggerPath": "${workspaceFolder}/.devcontainer/gdb-oneapi",
4+
# in the launch.json file
5+
6+
source /opt/intel/oneapi/setvars.sh
7+
gdb-oneapi $@

.gitattributes

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
*.dat text eol=lf
2+
*.dsl text eol=lf
3+
*.duff text eol=lf
4+
*.f90 text eol=lf
5+
*.F90 text eol=lf
6+
*.hcv text eol=lf
7+
*.inc text eol=lf
8+
*.INC text eol=lf
9+
*.json text eol=lf
10+
*.md text eol=lf
11+
*.mol2 text eol=lf
12+
*.pik text eol=lf
13+
*.ps1 text eol=lf
14+
*.rc text eol=lf
15+
*.sdi text eol=lf
16+
*.sh text eol=lf
17+
*.tcl text eol=lf
18+
*.tem text eol=lf
19+
*.tic text eol=lf
20+
*.txt text eol=lf
21+
*.xye text eol=lf
22+
*.zmatrix text eol=lf
23+
24+
wsl-vagrant text eol=lf
25+
Vagrantfile text eol=lf
26+
27+
*.bmp -text
28+
*.BMP -text
29+
*.dash -text
30+
*.gif -text
31+
*.icns -text
32+
*.ico -text
33+
*.png -text
34+
*.raw -text
35+
*.tif -text

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ bld
22
build
33
docs_dash_files
44
.vs
5+
.vagrant
6+
install
7+
*.mod
8+
winteracter-linux*.tar.bz2

.vscode/launch.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Run dash",
5+
"type": "cppdbg",
6+
"request": "launch",
7+
"args": [],
8+
"stopAtEntry": false,
9+
"cwd": "${workspaceFolder}/install/bin",
10+
"environment": [],
11+
"linux": {
12+
"program": "${workspaceFolder}/install/bin/DASH",
13+
"externalConsole": false,
14+
"MIMode": "gdb",
15+
"miDebuggerPath": "${workspaceFolder}/.devcontainer/gdb-oneapi",
16+
"setupCommands": [
17+
{
18+
"description": "Enable pretty-printing for gdb",
19+
"text": "-enable-pretty-printing",
20+
"ignoreFailures": true
21+
},
22+
{
23+
"description": "Disable target async",
24+
"text": "set target-async off",
25+
"ignoreFailures": true
26+
}
27+
]
28+
}
29+
}
30+
]
31+
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"cmake.configureOnOpen": false
3+
}

0 commit comments

Comments
 (0)