From 668476a241c45689e1131048f0a9873fdfac573e Mon Sep 17 00:00:00 2001
From: Hugo Larcher <hugo.larcher@huggingface.co>
Date: Mon, 2 Dec 2024 15:30:59 +0100
Subject: [PATCH] chore: fix dev containers

---
 .../Dockerfile                                |  0
 .devcontainer/devcontainer.json               | 26 +++++++++++++++++++
 .../install-dev-tools.sh                      |  0
 .../reinstall-cmake.sh                        |  0
 .../trtllm/.devcontainer/devcontainer.json    | 26 -------------------
 5 files changed, 26 insertions(+), 26 deletions(-)
 rename {backends/trtllm/.devcontainer => .devcontainer}/Dockerfile (100%)
 rename {backends/trtllm/.devcontainer => .devcontainer}/install-dev-tools.sh (100%)
 rename {backends/trtllm/.devcontainer => .devcontainer}/reinstall-cmake.sh (100%)
 delete mode 100644 backends/trtllm/.devcontainer/devcontainer.json

diff --git a/backends/trtllm/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
similarity index 100%
rename from backends/trtllm/.devcontainer/Dockerfile
rename to .devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e69de29b..01d23f67 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,26 @@
+// 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": "CUDA",
+  "image": "nvidia/cuda:12.6.0-devel-ubuntu24.04",
+//  "runArgs": [
+//    "--gpus=all"
+//  ],
+  "remoteEnv": {
+    "PATH": "${containerEnv:PATH}:/usr/local/cuda/bin",
+    "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64",
+    "XLA_FLAGS": "--xla_gpu_cuda_data_dir=/usr/local/cuda"
+  },
+  "updateContentCommand": "bash .devcontainer/install-dev-tools.sh",
+//  "postCreateCommand": [
+//    "nvidia-smi"
+//  ],
+  "customizations" : {
+    "jetbrains" : {
+      "backend" : "CLion"
+    }
+  },
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/backends/trtllm/.devcontainer/install-dev-tools.sh b/.devcontainer/install-dev-tools.sh
similarity index 100%
rename from backends/trtllm/.devcontainer/install-dev-tools.sh
rename to .devcontainer/install-dev-tools.sh
diff --git a/backends/trtllm/.devcontainer/reinstall-cmake.sh b/.devcontainer/reinstall-cmake.sh
similarity index 100%
rename from backends/trtllm/.devcontainer/reinstall-cmake.sh
rename to .devcontainer/reinstall-cmake.sh
diff --git a/backends/trtllm/.devcontainer/devcontainer.json b/backends/trtllm/.devcontainer/devcontainer.json
deleted file mode 100644
index 995ed2a4..00000000
--- a/backends/trtllm/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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": "CUDA",
-  "image": "nvidia/cuda:12.6.0-devel-ubuntu24.04",
-//  "runArgs": [
-//    "--gpus=all"
-//  ],
-  "remoteEnv": {
-    "PATH": "${containerEnv:PATH}:/usr/local/cuda/bin",
-    "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64",
-    "XLA_FLAGS": "--xla_gpu_cuda_data_dir=/usr/local/cuda"
-  },
-  "updateContentCommand": "bash backends/trtllm/.devcontainer/install-dev-tools.sh",
-//  "postCreateCommand": [
-//    "nvidia-smi"
-//  ],
-  "customizations" : {
-    "jetbrains" : {
-      "backend" : "CLion"
-    }
-  },
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}