Skip to content

Commit 22c0cfe

Browse files
committed
[update] Remove System Python
1 parent 8c60c56 commit 22c0cfe

6 files changed

Lines changed: 59 additions & 105 deletions

File tree

Dockerfile.cpu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ RUN wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && \
5151
apt-get update && apt-get install -y \
5252
clang-${LLVM_VERSION} lldb-${LLVM_VERSION} \
5353
clang-tools-${LLVM_VERSION} libclang-${LLVM_VERSION}-dev \
54-
clang-format-${LLVM_VERSION} python3-clang-${LLVM_VERSION} \
54+
clang-format-${LLVM_VERSION} libomp-${LLVM_VERSION}-dev \
5555
clangd-${LLVM_VERSION} clang-tidy-${LLVM_VERSION} \
5656
lldb-${LLVM_VERSION} libc++-${LLVM_VERSION}-dev \
57-
libc++abi-${LLVM_VERSION}-dev libomp-${LLVM_VERSION}-dev && \
57+
libc++abi-${LLVM_VERSION}-dev && \
5858
ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang && \
5959
ln -s /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++ && \
6060
ln -s /usr/bin/clangd-${LLVM_VERSION} /usr/bin/clangd && \
@@ -66,7 +66,7 @@ RUN wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && \
6666
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
6767

6868
# Config files
69-
COPY data/vimrc /etc/vim/vimrc
69+
COPY data/vimrc.local /etc/vim/vimrc.local
7070
COPY data/env_setup.sh ${ENV_SETUP_FILE}
7171
COPY data/.inputrc data/.bashrc data/.tmux.conf /root/
7272
COPY data/.inputrc data/.bashrc data/.tmux.conf /etc/skel/

Dockerfile.cuda

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ RUN wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && \
5151
apt-get update && apt-get install -y \
5252
clang-${LLVM_VERSION} lldb-${LLVM_VERSION} \
5353
clang-tools-${LLVM_VERSION} libclang-${LLVM_VERSION}-dev \
54-
clang-format-${LLVM_VERSION} python3-clang-${LLVM_VERSION} \
54+
clang-format-${LLVM_VERSION} libomp-${LLVM_VERSION}-dev \
5555
clangd-${LLVM_VERSION} clang-tidy-${LLVM_VERSION} \
5656
lldb-${LLVM_VERSION} libc++-${LLVM_VERSION}-dev \
57-
libc++abi-${LLVM_VERSION}-dev libomp-${LLVM_VERSION}-dev && \
57+
libc++abi-${LLVM_VERSION}-dev && \
5858
ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang && \
5959
ln -s /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++ && \
6060
ln -s /usr/bin/clangd-${LLVM_VERSION} /usr/bin/clangd && \
@@ -66,7 +66,7 @@ RUN wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && \
6666
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
6767

6868
# Config files
69-
COPY data/vimrc /etc/vim/vimrc
69+
COPY data/vimrc.local /etc/vim/vimrc.local
7070
COPY data/env_setup.sh ${ENV_SETUP_FILE}
7171
COPY data/.inputrc data/.bashrc data/.tmux.conf /root/
7272
COPY data/.inputrc data/.bashrc data/.tmux.conf /etc/skel/

data/env_setup.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env_load() {
2323
local var_name=$1
2424
local new_path=$2
2525
if [[ ":${!var_name}:" != *":$new_path:"* ]]; then
26-
export "$var_name"="${!var_name:+"${!var_name}:"}$new_path"
26+
export "$var_name"="$new_path${!var_name:+":${!var_name}"}"
2727
fi
2828
}
2929

@@ -70,16 +70,23 @@ if [ -d "${UV_HOME:-}" ]; then
7070
alias UNLOAD_UV="env_unload PATH $UV_HOME"
7171
env_load PATH "$UV_HOME"
7272
echo "[ENV-SETUP] UV initialized from $UV_HOME"
73-
echo "|- Note: For managing shared UV cache directory:"
74-
echo "|- 1. Export UV_CACHE_DIR to a target directory. (No need to create it first.)"
75-
echo "|- 2. Run: \`sudo create-shared-dir <group> \${UV_CACHE_DIR}\` ONLY ONCE."
76-
echo "|- 3. For all users in <group>, make sure UV_CACHE_DIR is exported properly."
77-
echo "|- You can add it to \${ENV_SETUP_FILE} for convenience."
78-
echo "|- 4. Remove this note from \${ENV_SETUP_FILE} if you want."
79-
73+
cat << 'EOF'
74+
|- NOTE: For managing shared UV cache and python directory:
75+
|- 1. Export UV_CACHE_DIR and UV_PYTHON_INSTALL_DIR to a target directory.
76+
| (No need to create them first.)
77+
|- 2. Run command below ONLY ONCE to create the shared directories:
78+
| $ create-shared-dir <group> ${UV_CACHE_DIR} ${UV_PYTHON_INSTALL_DIR}
79+
|- 3. For all users in <group>, make sure UV_CACHE_DIR and
80+
| UV_PYTHON_INSTALL_DIR are exported properly.
81+
| You can do this in ${ENV_SETUP_FILE} for convenience.
82+
|- 4. Remove this NOTE from ${ENV_SETUP_FILE} if you want.
83+
EOF
8084
## You can uncomment the following line to set a shared cache dir for UV.
8185
## Make sure to run `sudo create-shared-dir <group> $UV_CACHE_DIR` ONLY ONCE.
8286
# export UV_CACHE_DIR="$UV_HOME/.cache"
87+
# export UV_PYTHON_INSTALL_DIR="$UV_HOME/python"
88+
echo "|- UV_CACHE_DIR: ${UV_CACHE_DIR:-<not set>}"
89+
echo "|- UV_PYTHON_INSTALL_DIR: ${UV_PYTHON_INSTALL_DIR:-<not set>}"
8390
else
8491
unset UV_HOME
8592
fi

data/vimrc

Lines changed: 0 additions & 90 deletions
This file was deleted.

data/vimrc.local

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
2+
3+
set showcmd " Show (partial) command in status line.
4+
set showmatch " Show matching brackets.
5+
set ignorecase " Do case insensitive matching
6+
set smartcase " Do smart case matching
7+
set incsearch " Incremental search
8+
set autowrite " Automatically save before commands like :next and :make
9+
set hidden " Hide buffers when they are abandoned
10+
set mouse=a " Enable mouse usage (all modes)
11+
12+
set number
13+
set cursorline
14+
" set cursorcolumn
15+
set shiftwidth=4
16+
set tabstop=4
17+
set expandtab
18+
set scrolloff=10
19+
set showmode
20+
set hlsearch
21+
22+
set autoindent
23+
set smartindent
24+
set cindent
25+
filetype indent on
26+
27+
augroup numbertoggle
28+
autocmd!
29+
autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu && mode() != "i" | set rnu | endif
30+
autocmd BufLeave,FocusLost,InsertEnter,WinLeave * if &nu | set nornu | endif
31+
augroup END
32+
33+
" Set the menu & message to English
34+
set langmenu=en_US
35+
let $LANG='en_US'
36+
source $VIMRUNTIME/delmenu.vim
37+
source $VIMRUNTIME/menu.vim

scripts/image-configs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMAGE_VERSION=2.4.2
1+
IMAGE_VERSION=2.4.3
22
TORCH_VERSION=2.7.1
33
CUDA_VERSION=12.8.0
44
UBUNTU_VERSION=24.04

0 commit comments

Comments
 (0)