Skip to content

Commit 9b353e7

Browse files
Move docker container to port 9999 and some other minor fixes
1 parent 7d782d3 commit 9b353e7

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

Dockerfile

+8-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ARG BASE_CONTAINER=jupyter/base-notebook
66
ARG BASE_TAG=latest
77
ARG BUILD_TYPE=Debug
88

9+
910
FROM $BASE_CONTAINER:$BASE_TAG
1011

1112
LABEL maintainer="Xeus-cpp Project"
@@ -61,7 +62,8 @@ USER ${NB_UID}
6162
# Copy git repository to home directory of container
6263
COPY --chown=${NB_UID}:${NB_GID} . "${HOME}"/
6364

64-
EXPOSE 8888
65+
EXPOSE 9999
66+
ENV JUPYTER_PORT=9999
6567

6668
# Configure container startup
6769
CMD ["start-notebook.sh", "--debug", "&>/home/jovyan/log.txt"]
@@ -108,8 +110,9 @@ ENV NB_PYTHON_PREFIX=${CONDA_DIR} \
108110
/opt/conda/envs/.venv/x86_64-conda-linux-gnu/include/c++/12.3.0:\
109111
/opt/conda/envs/.venv/x86_64-conda-linux-gnu/include/c++/12.3.0/x86_64-conda-linux-gnu:\
110112
/opt/conda/envs/.venv/x86_64-conda-linux-gnu/include/c++/12.3.0/backward:\
111-
/opt/conda/envs/.venv/x86_64-conda-linux-gnu/sysroot/usr/include
112-
113+
/opt/conda/envs/.venv/x86_64-conda-linux-gnu/sysroot/usr/include:\
114+
#
115+
/usr/include
113116

114117
# VENV
115118

@@ -185,8 +188,8 @@ RUN \
185188
conda activate .venv && \
186189
#
187190
export PATH_TO_LLVM_BUILD=${VENV} && \
188-
#export PATH=${VENV}/bin:${CONDA_DIR}/bin:$PATH_TO_LLVM_BUILD/bin:$PATH && \
189-
export PATH=${VENV}/bin:${CONDA_DIR}/bin:$PATH && \
191+
###export PATH=${VENV}/bin:${CONDA_DIR}/bin:$PATH_TO_LLVM_BUILD/bin:$PATH && \
192+
##export PATH=${VENV}/bin:${CONDA_DIR}/bin:$PATH && \
190193
echo "export EDITOR=emacs" >> ~/.profile && \
191194
#
192195
# Build CppInterOp

run-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jupyter-repo2docker \
88
.
99

1010
#docker run --gpus all --publish 8888:8888 --name xeus-cpp-c -i -t xeus-cpp "start-notebook.sh"
11-
docker run --rm --runtime=nvidia --gpus all --publish 8888:8888 --name xeus-cpp-c -i -t xeus-cpp "start-notebook.sh"
11+
docker run --rm --runtime=nvidia --gpus all --publish 9999:9999 --name xeus-cpp-c -i -t xeus-cpp "start-notebook.sh"
1212

1313
# --editable \
1414
# --ref InterOpIntegration \

share/jupyter/kernels/xcpp/kernel.json.in

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"@CMAKE_VENV_PATH@/bin/xcpp",
1111
"-f",
1212
"{connection_file}",
13+
"-cuda",
1314
"-std=c++17"@CMAKE_OMP@
1415
],
1516
"language": "cpp",

src/xmagics/pythonexec.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ void pythonexec::startup() {
5353
// if (!gMainDict)
5454
// printf("Could not add module __main__");
5555

56-
5756
// // Retrieve the dictionary of cppyy module
5857
// PyObject* cppyyDict = PyModule_GetDict(cppyyModule);
5958
// Py_DECREF(cppyyModule);

0 commit comments

Comments
 (0)