misantamaria commited on
Commit
4f01f39
1 Parent(s): d4de1ab

before coming back

Browse files
Files changed (2) hide show
  1. Dockerfile +6 -4
  2. r_shiny_app/global.R +6 -0
Dockerfile CHANGED
@@ -13,7 +13,7 @@
13
  # Base image #
14
  ##############
15
  # Adds rstudio server, tiyverse, devtools to rocker/cuda
16
- FROM misantamaria/dvats-rstudio:0
17
 
18
  SHELL [ "/bin/bash", "--login", "-c" ]
19
 
@@ -39,9 +39,9 @@ ENV USER_NAME=$USER_NAME \
39
  WANDB_PROJECT=$WANDB_PROJECT
40
 
41
  RUN echo "--> Setup ENV variables"
42
- ENV RETICULATE_PYTHON_ENV=/home/env \
43
- ROOT=TRUE \
44
- RETICULATE_MINICONDA_PATH=/home//miniconda \
45
  #1,2,3... En la barata solo tienes 1 :)
46
  CUDA_VISIBLE_DEVICES=0\
47
  ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES\
@@ -67,6 +67,7 @@ COPY --chown=${USER_ID}:${GROUP_ID} ../dvats $DVATSDIR
67
 
68
 
69
  RUN chown ${USER_ID}:${GROUP_ID} /var/run/s6
 
70
  # Install deepvats
71
 
72
  RUN echo "--> Go!"
@@ -79,6 +80,7 @@ ENV RSTUDIO_PORT=$RSTUDIO_PORT
79
  ENV APP="app"
80
 
81
  RUN ls -la ${APPDIR}
 
82
  RUN mamba install -c conda-forge python-kaleido
83
  #CMD [ "R", "-e", "shiny::runApp(host='0.0.0.0'", "port="${RSTUDIO_PORT}, "appDir = '/home/${USER_NAME}/app')" ]
84
  #CMD [ "R -e shiny::runApp(host='0.0.0.0', port=Sys.getenv('RSTUDIO_PORT'), appDir = Sys.getenv('APPDIR'))" ]
 
13
  # Base image #
14
  ##############
15
  # Adds rstudio server, tiyverse, devtools to rocker/cuda
16
+ FROM misantamaria/dvats-rstudio:rocker-ml4.2
17
 
18
  SHELL [ "/bin/bash", "--login", "-c" ]
19
 
 
39
  WANDB_PROJECT=$WANDB_PROJECT
40
 
41
  RUN echo "--> Setup ENV variables"
42
+ #ENV RETICULATE_PYTHON_ENV=/home/env \
43
+ ENV ROOT=TRUE \
44
+ #RETICULATE_MINICONDA_PATH=/home/miniconda3 \
45
  #1,2,3... En la barata solo tienes 1 :)
46
  CUDA_VISIBLE_DEVICES=0\
47
  ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES\
 
67
 
68
 
69
  RUN chown ${USER_ID}:${GROUP_ID} /var/run/s6
70
+ RUN chown ${USER_ID}:${GROUP_ID} /home/
71
  # Install deepvats
72
 
73
  RUN echo "--> Go!"
 
80
  ENV APP="app"
81
 
82
  RUN ls -la ${APPDIR}
83
+ RUN echo "RETICULATE_MINICONDA_PATH" $RETICULATE_MINICONDA_PATH
84
  RUN mamba install -c conda-forge python-kaleido
85
  #CMD [ "R", "-e", "shiny::runApp(host='0.0.0.0'", "port="${RSTUDIO_PORT}, "appDir = '/home/${USER_NAME}/app')" ]
86
  #CMD [ "R -e shiny::runApp(host='0.0.0.0', port=Sys.getenv('RSTUDIO_PORT'), appDir = Sys.getenv('APPDIR'))" ]
r_shiny_app/global.R CHANGED
@@ -49,11 +49,17 @@ if(torch$cuda$is_available()){
49
  #hdbscan = import("hdbscan")
50
  #dvats = import_from_path("dvats.all", path=paste0(Sys.getenv("HOME")))
51
  ############Just in case. Trying to get why get_enc_embs gets freezed
 
52
  # Python dependencies
 
53
  tsai_data = reticulate::import("tsai.data.all")
 
54
  wandb = reticulate::import("wandb")
 
55
  pd = reticulate::import("pandas")
 
56
  hdbscan = reticulate::import("hdbscan")
 
57
  dvats = reticulate::import_from_path("dvats.all", path=paste0(Sys.getenv("HOME")))
58
 
59
 
 
49
  #hdbscan = import("hdbscan")
50
  #dvats = import_from_path("dvats.all", path=paste0(Sys.getenv("HOME")))
51
  ############Just in case. Trying to get why get_enc_embs gets freezed
52
+
53
  # Python dependencies
54
+ print("--> py dependences | Tsai")
55
  tsai_data = reticulate::import("tsai.data.all")
56
+ print("--> py dependences | Wandb")
57
  wandb = reticulate::import("wandb")
58
+ print("--> py dependences | PANDAS")
59
  pd = reticulate::import("pandas")
60
+ print("--> py dependences | Hdbscan")
61
  hdbscan = reticulate::import("hdbscan")
62
+ print("--> py dependences | Dvats")
63
  dvats = reticulate::import_from_path("dvats.all", path=paste0(Sys.getenv("HOME")))
64
 
65