Use ninja for dolfin, updated paths

Author: w1th0utnam3

.gitignore

@@ -7,4 +7,4 @@
 __pycache__
 
 # Temporary files
-main/simd/tmp
+simd/tmp/**

Dockerfile

@@ -3,29 +3,25 @@
 
 FROM quay.io/w1th0utnam3/docker-dolfinx-base:latest
 
-# Install other dependencies
-RUN pip3 install cffi pytest
-
 # Clone this repository
 WORKDIR /local
 RUN git clone --recurse-submodules https://github.com/w1th0utnam3/fenics_work.git
 
 # Install FIAT, UFL, dijitso and ffcx
-RUN pip3 install -e /local/fenics_work/main/fiat && \
-	pip3 install -e /local/fenics_work/main/ufl && \
-	pip3 install -e /local/fenics_work/main/dijitso && \
-	pip3 install -e /local/fenics_work/main/ffcx
+RUN pip3 install -e /local/fenics_work/submodules/fiat && \
+	pip3 install -e /local/fenics_work/submodules/ufl && \
+	pip3 install -e /local/fenics_work/submodules/dijitso && \
+	pip3 install -e /local/fenics_work/submodules/ffcx
 
 # Build and install dolfinx
-RUN cd /local/fenics_work/main/dolfinx && \
+RUN cd /local/fenics_work/submodules/dolfinx && \
 	mkdir build && \
 	cd build && \
-	cmake -DCMAKE_BUILD_TYPE=Developer ../cpp && \
-	make -j8 && \
-	make install
+	cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer ../cpp && \
+	ninja -j8 install
 
 # Install dolfinx python package
-RUN pip3 install -e /local/fenics_work/main/dolfinx/python
+RUN pip3 install -e /local/fenics_work/submodules/dolfinx/python
 
 WORKDIR /tmp
 
@@ -38,6 +34,6 @@ RUN pip3 install --no-cache-dir git+https://github.com/coneoproject/COFFEE.git
 RUN pip3 install --no-cache-dir git+https://github.com/FInAT/FInAT.git
 
 # Additional packages for development
-RUN pip3 install dataclasses
+RUN pip3 install dataclasses cffi pytest
 
-WORKDIR /local/fenics_work/main
+WORKDIR /local/fenics_work/simd

activate_env.sh

@@ -2,11 +2,10 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/dijitso
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/dolfinx/python
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/ffcx
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/fiat
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/minidolfin
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/ufl
-export PYTHONPATH=${PYTHONPATH}:${DIR}/main/simd/ttbench
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/dijitso
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/dolfinx/python
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/ffcx
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/fiat
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/minidolfin
+export PYTHONPATH=${PYTHONPATH}:${DIR}/submodules/ufl
+export PYTHONPATH=${PYTHONPATH}:${DIR}/simd/ttbench

build_dolfin.sh

@@ -1,5 +1,4 @@
 #! /bin/bash
 
-cd /local/fenics_work/main/dolfinx/build && \
-	make -j8 && \
-	make install
+cd /local/fenics_work/submodules/dolfinx/build && \
+	ninja -j8 install