From e63453fa848bd28b399646ff1cc06c05a75f9e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Thu, 15 Aug 2024 19:12:08 +0300 Subject: [PATCH 01/10] Update devcontainer.json removed timeout --- .devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ddf68257..4aa09f91 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,8 +5,8 @@ "dockerfile": "Dockerfile", "args": { "NODE_VERSION": "lts/*", - "DOCKER_CLIENT_TIMEOUT": "120", - "COMPOSE_HTTP_TIMEOUT": "120" + "DOCKER_CLIENT_TIMEOUT": "", + "COMPOSE_HTTP_TIMEOUT": "" } }, "hostRequirements": { From 7ead0c105667de055c46e25798d88992816990f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Thu, 15 Aug 2024 19:13:23 +0300 Subject: [PATCH 02/10] Update environment.yml removed specific dependancies versions --- .devcontainer/environment.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.devcontainer/environment.yml b/.devcontainer/environment.yml index d16ba697..1edb3323 100644 --- a/.devcontainer/environment.yml +++ b/.devcontainer/environment.yml @@ -3,22 +3,22 @@ channels: - defaults - conda-forge dependencies: - - ipykernel=6.4.1 - - ipython=7.27.0 - - ipywidgets=7.6.5 - - jupyter=1.0.0 - - matplotlib=3.4.2 - - numpy=1.22.3 - - python=3.8.12ip - - requests=2.26.0 - - scikit-learn=0.24.2 - - scipy=1.6.2 - - pip=21.0.1 - - conda-forge::opencv=4.5 - - setuptools=58.0.4 - - pytorch::pytorch=1.11.0 - - pytorch::torchtext=0.12.0 - - pytorch::torchvision=0.12.0 - - pytorch::torchdata=0.3.0 + - ipykernel + - ipython + - ipywidgets + - jupyter + - matplotlib=3.9 + - numpy=1.26 + - python + - requests=2.32 + - scikit-learn + - scipy=1.13 + - pip + - conda-forge::opencv + - setuptools + - pytorch::pytorch + - pytorch::torchtext + - pytorch::torchvision + - pytorch::torchdata - pip: - -r requirements.txt From 91eefa848ddbfc35f9fa56dfa269e87b264fbbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Thu, 15 Aug 2024 19:14:37 +0300 Subject: [PATCH 03/10] Update requirements.txt update dependency versions --- .devcontainer/requirements.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index 9c3e6bee..715986ea 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -2,21 +2,21 @@ gensim==4.3.3 gym==0.26.2 huggingface==0.0.1 imageio==2.35.0 -keras==2.13.1 +keras nltk==3.8.2 -pandas==2.0.3 +pandas==2.2.2 pillow==10.4.0 pygame==2.6.0 -scikit-image==0.21.0 +scikit-image==0.24.0 seaborn==0.13.2 smart-open==7.0.4 -tensorboard-data-server==0.7.2 -tensorflow-datasets==4.9.2 +tensorboard-data-server==0.6.1 +tensorflow-datasets==4.9.6 tensorflow-hub==0.16.1 -tensorflow-text==2.13.0 -tensorflow==2.13.1 -tensorboard==2.13.0 -tokenizers==0.19.1 -torchinfo==1.8.0 -tqdm==4.66.5 -transformers==4.44.0 +tensorflow +tensorboard +tokenizers +torchinfo +tqdm +# transformers +# tensorflow-text From 40b3dbf698c7132ffad677b48efa55fd8d261939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Fri, 16 Aug 2024 08:48:28 +0300 Subject: [PATCH 04/10] Update requirements.txt removed nltk version added transformers and tensorflow-text --- .devcontainer/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index 715986ea..b55c835a 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -3,7 +3,7 @@ gym==0.26.2 huggingface==0.0.1 imageio==2.35.0 keras -nltk==3.8.2 +nltk pandas==2.2.2 pillow==10.4.0 pygame==2.6.0 @@ -18,5 +18,5 @@ tensorboard tokenizers torchinfo tqdm -# transformers -# tensorflow-text +transformers +tensorflow-text From eee2d262767493c874561f8e536cc9361534f4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Fri, 16 Aug 2024 09:05:56 +0300 Subject: [PATCH 05/10] Update requirements.txt removed dependancies: # transformers # tensorflow-text --- .devcontainer/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index b55c835a..d90a72ab 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -18,5 +18,4 @@ tensorboard tokenizers torchinfo tqdm -transformers -tensorflow-text + From b996627356c68ecfd167228eaea8b2e4fe82eca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Fri, 16 Aug 2024 10:37:10 +0300 Subject: [PATCH 06/10] Update requirements.txt removed tensorboard data server version --- .devcontainer/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index d90a72ab..88479725 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -10,7 +10,7 @@ pygame==2.6.0 scikit-image==0.24.0 seaborn==0.13.2 smart-open==7.0.4 -tensorboard-data-server==0.6.1 +tensorboard-data-server tensorflow-datasets==4.9.6 tensorflow-hub==0.16.1 tensorflow From a850fa34404e8534d8aab00c30a08af39ba77c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Fri, 16 Aug 2024 13:36:20 +0300 Subject: [PATCH 07/10] Update requirements.txt updated versions to match installed in prebuild --- .devcontainer/requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index 88479725..fc5e3d6d 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -2,20 +2,20 @@ gensim==4.3.3 gym==0.26.2 huggingface==0.0.1 imageio==2.35.0 -keras -nltk +keras==3.5.0 +nltk==3.8.1 pandas==2.2.2 pillow==10.4.0 pygame==2.6.0 scikit-image==0.24.0 seaborn==0.13.2 smart-open==7.0.4 -tensorboard-data-server +tensorboard-data-server==0.7.2 tensorflow-datasets==4.9.6 tensorflow-hub==0.16.1 -tensorflow -tensorboard -tokenizers -torchinfo -tqdm +tensorflow==2.17.0 +tensorboard==2.17.1 +tokenizers==0.20.0 +torchinfo==1.8.0 +tqdm==4.66.5 From a00890bfa031657d9be304d560ca304d7f56f534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Mon, 19 Aug 2024 17:07:36 +0300 Subject: [PATCH 08/10] Update Dockerfile commented --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f9be646d..b5b0b708 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,8 +4,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/miniconda:0-3 ARG NODE_VERSION="none" RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install libgl1 +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install libgl1 # Copy environment.yml (if found) to a temp location so we update the environment. Also # copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists. From 3a0655edf571964a1e235d547582bb62635bdbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Mon, 19 Aug 2024 17:10:59 +0300 Subject: [PATCH 09/10] Update environment.yml change channel priority to flexible --- .devcontainer/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/environment.yml b/.devcontainer/environment.yml index 1edb3323..c41a9760 100644 --- a/.devcontainer/environment.yml +++ b/.devcontainer/environment.yml @@ -1,6 +1,6 @@ name: ai4beg channels: - - defaults + - flexible - conda-forge dependencies: - ipykernel From 5b31da5913240083f29e306090103bfbe9135412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pikach=C3=BA?= Date: Mon, 19 Aug 2024 17:47:16 +0300 Subject: [PATCH 10/10] Update environment.yml change conda channel --- .devcontainer/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/environment.yml b/.devcontainer/environment.yml index c41a9760..1edb3323 100644 --- a/.devcontainer/environment.yml +++ b/.devcontainer/environment.yml @@ -1,6 +1,6 @@ name: ai4beg channels: - - flexible + - defaults - conda-forge dependencies: - ipykernel