From 39e3278682f2db0e6024a66b35c9daf6a79f9ba8 Mon Sep 17 00:00:00 2001 From: Jan Grzybek Date: Tue, 26 Nov 2024 14:43:24 +0100 Subject: [PATCH 1/4] Update setup_deb.sh --- setup_deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_deb.sh b/setup_deb.sh index 21e94741..c4450dff 100644 --- a/setup_deb.sh +++ b/setup_deb.sh @@ -46,7 +46,7 @@ fi log "Installing system dependencies ..." sleep 1 apt-get update -y -apt-get install -y python3 python3-pip build-essential ffmpeg libsm6 libxext6 wget git unzip numactl libhdf5-dev cmake +apt-get install -y python3-pip build-essential ffmpeg libsm6 libxext6 wget git unzip numactl libhdf5-dev cmake PYTHON_VERSION=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[0:2])))') PYTHON_DEV_SEARCH=$(apt-cache search --names-only "python${PYTHON_VERSION}-dev") if [[ -n "$PYTHON_DEV_SEARCH" ]]; then From 6c737eff6b63c92e4530e9e3c1e505490061f631 Mon Sep 17 00:00:00 2001 From: Jan Grzybek Date: Tue, 26 Nov 2024 14:45:02 +0100 Subject: [PATCH 2/4] Update setup_rhel.sh --- setup_rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_rhel.sh b/setup_rhel.sh index 1e6015cb..2c2751e4 100644 --- a/setup_rhel.sh +++ b/setup_rhel.sh @@ -47,7 +47,7 @@ log "Installing system dependencies ..." sleep 1 yum install epel-release || : yum groupinstall -y 'Development Tools' -yum install -y python3 python3-devel python3-pip libSM libXext wget git unzip numactl hdf5-devel cmake gcc-c++ +yum install -y python3-devel python3-pip libSM libXext wget git unzip numactl hdf5-devel cmake gcc-c++ git clone -b n4.3.7 https://github.com/FFmpeg/FFmpeg.git && cd FFmpeg && ./configure && make -j && make install && cd .. && rm -r FFmpeg log "done.\n" From fbe4deebbf4f029a63d136526edccb6e48c53426 Mon Sep 17 00:00:00 2001 From: Jan Grzybek Date: Tue, 26 Nov 2024 15:32:06 +0100 Subject: [PATCH 3/4] Update setup_deb.sh --- setup_deb.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup_deb.sh b/setup_deb.sh index c4450dff..9850983c 100644 --- a/setup_deb.sh +++ b/setup_deb.sh @@ -46,11 +46,14 @@ fi log "Installing system dependencies ..." sleep 1 apt-get update -y -apt-get install -y python3-pip build-essential ffmpeg libsm6 libxext6 wget git unzip numactl libhdf5-dev cmake +apt-get install -y build-essential ffmpeg libsm6 libxext6 wget git unzip numactl libhdf5-dev cmake +if ! python3 -c ""; then + apt-get install -y python3 python3-pip +fi PYTHON_VERSION=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[0:2])))') PYTHON_DEV_SEARCH=$(apt-cache search --names-only "python${PYTHON_VERSION}-dev") if [[ -n "$PYTHON_DEV_SEARCH" ]]; then - apt-get -y install "python${PYTHON_VERSION}-dev" + apt-get install -y "python${PYTHON_VERSION}-dev" fi log "done.\n" From 658f24faa29d8ddaa62a7100abe49d42a03e0189 Mon Sep 17 00:00:00 2001 From: Jan Grzybek Date: Tue, 26 Nov 2024 15:38:22 +0100 Subject: [PATCH 4/4] Update setup_deb.sh --- setup_deb.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup_deb.sh b/setup_deb.sh index 9850983c..2e6b4a63 100644 --- a/setup_deb.sh +++ b/setup_deb.sh @@ -50,6 +50,9 @@ apt-get install -y build-essential ffmpeg libsm6 libxext6 wget git unzip numactl if ! python3 -c ""; then apt-get install -y python3 python3-pip fi +if ! pip3 --version; then + apt-get install -y python3-pip +fi PYTHON_VERSION=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[0:2])))') PYTHON_DEV_SEARCH=$(apt-cache search --names-only "python${PYTHON_VERSION}-dev") if [[ -n "$PYTHON_DEV_SEARCH" ]]; then