Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile

This file was deleted.

14 changes: 14 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"features": {
"ghcr.io/devcontainers/features/python:1": {
"version": "1.8.0",
"resolved": "ghcr.io/devcontainers/features/python@sha256:fbcad6955caeecc5ad3f7886baf652e25cba5225a6c4c2287c536de2e5607511",
"integrity": "sha256:fbcad6955caeecc5ad3f7886baf652e25cba5225a6c4c2287c536de2e5607511"
},
"ghcr.io/msclock/features/vcpkg:2": {
"version": "2.0.0",
"resolved": "ghcr.io/msclock/features/vcpkg@sha256:bcb75d475252af1f9ef742860387cb15e059f57041748abdd02030cd1a181471",
"integrity": "sha256:bcb75d475252af1f9ef742860387cb15e059f57041748abdd02030cd1a181471"
}
}
}
91 changes: 47 additions & 44 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,49 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
{
"name": "OpenSEMBA dev. framework",
"build": {
"dockerfile": "Dockerfile"
},
"features": {
"ghcr.io/msclock/features/vcpkg:2": {},
"ghcr.io/devcontainers/features/python:1": {}
},

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",

// Configure tool-specific properties.
"customizations": {
"codespaces": {
"repositories": {
"lmdiazangulo/json-fortran": { "permissions": "read-all" },
"opensemba/fhash": { "permissions": "read-all" },
"reference-lapack/lapack": { "permissions": "read-all" },
"opensemba/ngtest": {"permissions": "read-all" },
"google/googletest": { "permissions": "read-all" }
}
},
"vscode": {
"extensions": [
"ms-toolsai.jupyter",
"fortran-lang.linter-gfortran",
"ms-vscode.cmake-tools",
"ms-python.autopep8",
"matepek.vscode-catch2-test-adapter"
]
}
}

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
"name": "semba-fdtd dev",
"dockerComposeFile": [
"../docker-compose.yml"
],
"service": "dev",
"workspaceFolder": "/home/developer/workspaces/fdtd",
"remoteUser": "developer",
"containerUser": "developer",
"overrideCommand": false,
"features": {
"ghcr.io/msclock/features/vcpkg:2": {},
"ghcr.io/devcontainers/features/python:1": {}
},
"remoteEnv": {
"HOME": "/home/developer",
"XDG_CONFIG_HOME": "/home/developer/.config",
"XDG_DATA_HOME": "/home/developer/.local/share",
"OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}"
},
"postCreateCommand": ".devcontainer/setup-python.sh",
"postStartCommand": "bash scripts/devcontainer-post-start.sh",
"customizations": {
"codespaces": {
"repositories": {
"lmdiazangulo/json-fortran": { "permissions": "read-all" },
"opensemba/fhash": { "permissions": "read-all" },
"reference-lapack/lapack": { "permissions": "read-all" },
"opensemba/ngtest": { "permissions": "read-all" },
"google/googletest": { "permissions": "read-all" }
}
},
"vscode": {
"extensions": [
"fortran-lang.linter-gfortran",
"ms-vscode.cmake-tools",
"ms-vscode.cpptools",
"ms-python.python",
"mhutchie.git-graph"
],
"settings": {
"cmake.buildDirectory": "${workspaceFolder}/build",
"cmake.useCMakePresets": "always",
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
"terminal.integrated.defaultProfile.linux": "bash"
}
}
}
}
12 changes: 0 additions & 12 deletions .devcontainer/notes.md

This file was deleted.

6 changes: 6 additions & 0 deletions .devcontainer/setup-python.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail

python3 -m venv .venv
.venv/bin/python -m pip install --upgrade pip
.venv/bin/python -m pip install -r requirements.txt
26 changes: 25 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.git
build/
build-*/
.venv/
.devcontainer/
.vscode/
.github/
__pycache__/
*.pyc
*.pyo
Expand All @@ -9,4 +13,24 @@ __pycache__/
dist/
*.o
*.mod
# Keep precompiled_libraries and external/ submodule contents

# Runtime/development bind mounts do not need to be copied into image layers.
simulations/

# Linux Docker builds only use the GNU LAPACK bundle.
precompiled_libraries/**
!precompiled_libraries/
!precompiled_libraries/linux-gcc/
!precompiled_libraries/linux-gcc/**

# The top-level build only consumes selected external sources.
external/lapack/
external/ngspice/examples/
external/ngspice/tests/
external/ngspice/visualc/
external/ngspice/man/
external/ngspice/doc/
external/ngspice/.git/
external/googletest/.git/
external/json-fortran/.git/
external/fhash/.git/
5 changes: 4 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
mtln: ["ON", "OFF"]
hdf: ["ON"]
double-precision: ["OFF"]
new-output-module: ["OFF","ON"]

include:
# Disable by lack of space on github action
Expand Down Expand Up @@ -86,13 +87,15 @@ jobs:
-DSEMBA_FDTD_ENABLE_MPI=${{matrix.mpi}} \
-DSEMBA_FDTD_ENABLE_HDF=${{matrix.hdf}} \
-DSEMBA_FDTD_ENABLE_MTLN=${{matrix.mtln}} \
-DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}}
-DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}} \
-DSEMBA_FDTD_ENABLE_OUTPUT_MODULE=${{matrix.new-output-module}}
cmake --build build -j

- name: Run unit tests
run: build/bin/fdtd_tests

- name: Run python tests
if: matrix.new-output-module=='OFF'
env:
SEMBA_FDTD_ENABLE_MPI: ${{ matrix.mpi }}
SEMBA_FDTD_ENABLE_MTLN: ${{ matrix.mtln }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
mtln: ["ON", "OFF"]
hdf: ["ON"]
double-precision: ["ON", "OFF"]
new-output-module: ["ON"]

fail-fast: false
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -65,13 +66,15 @@ jobs:
-DSEMBA_FDTD_ENABLE_MPI=${{matrix.mpi}} \
-DSEMBA_FDTD_ENABLE_HDF=${{matrix.hdf}} \
-DSEMBA_FDTD_ENABLE_MTLN=${{matrix.mtln}} \
-DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}}
-DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}} \
-DSEMBA_FDTD_ENABLE_OUTPUT_MODULE=${{matrix.new-output-module}}
cmake --build build -j

- name: Run unit tests
run: build/bin/fdtd_tests.exe

- name: Run python tests (except codemodel)
if: matrix.new-output-module == 'OFF'
env:
SEMBA_FDTD_ENABLE_MPI: ${{ matrix.mpi }}
SEMBA_FDTD_ENABLE_MTLN: ${{ matrix.mtln }}
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ Testing/
/SEMBA_FDTD_temp.log
.vscode/launch.json
.vscode/settings.json
.vscode/tasks.json
*/*.bak
./*.bak
.vscode/ltex.dictionary.en-US.txt
Expand All @@ -76,4 +75,5 @@ git_info.txt

.venv/build2/
build2/
.venv/
.venv/
specs/changes/*
Loading
Loading