Skip to content

Commit eaaa40b

Browse files
committed
Don't try to install giflib, remove dead conan llvm code
Signed-off-by: Larry Gritz <[email protected]>
1 parent 96b10cf commit eaaa40b

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

src/build-scripts/gh-installdeps.bash

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ if [[ "$ASWF_ORG" != "" ]] ; then
3535
#ls /etc/yum.repos.d
3636
rpm -qa --queryformat '%10{size} - %-25{name} \t %{version}\n' | sort -n
3737

38+
df -h
3839
time sudo yum remove -y nsight-compute-2022.3.0 libcublas-devel-11-8 libcublas-11-8 libcusparse-devel-11-8 libnpp-devel-11-8 libnpp-11-8 libcurand-devel-11-8 libcurand-11-8 || true
3940
time sudo yum remove -y nsight-compute-2024.3.1 libcublas-devel-12-6 libcublas-12-6 libcusparse-devel-12-6 libnpp-devel-12-6 libnpp-12-6 libcurand-devel-12-6 libcurand-12-6 || true
4041
df -h
42+
sudo lsof | grep deleted
4143

4244
# time sudo dnf upgrade --refresh || true
4345
time sudo dnf install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm -y || true
@@ -49,7 +51,7 @@ if [[ "$ASWF_ORG" != "" ]] ; then
4951
sed -i 's,^mirrorlist=,#,; s,^#baseurl=http://mirror\.centos\.org/centos/$releasever,baseurl=https://vault.centos.org/7.9.2009,' /etc/yum.repos.d/CentOS-Base.repo
5052
fi
5153

52-
time time sudo yum install -y giflib giflib-devel || true
54+
# time time sudo yum install -y giflib giflib-devel || true
5355
if [[ "${USE_OPENCV}" != "0" ]] ; then
5456
time sudo yum install -y opencv opencv-devel || true
5557
fi
@@ -69,25 +71,6 @@ if [[ "$ASWF_ORG" != "" ]] ; then
6971
time pip3 install ${PIP_INSTALLS} || true
7072
fi
7173

72-
if [[ "${CONAN_LLVM_VERSION}" != "" ]] ; then
73-
mkdir conan
74-
pushd conan
75-
# Simple way to conan install just one package:
76-
# conan install clang/${CONAN_LLVM_VERSION}@aswftesting/ci_common1 -g deploy -g virtualenv
77-
# But the below method can accommodate multiple requirements:
78-
echo "[imports]" >> conanfile.txt
79-
echo "., * -> ." >> conanfile.txt
80-
echo "[requires]" >> conanfile.txt
81-
echo "clang/${CONAN_LLVM_VERSION}@aswftesting/ci_common1" >> conanfile.txt
82-
time conan install .
83-
echo "--ls--"
84-
ls -R .
85-
export PATH=$PWD/bin:$PATH
86-
export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH
87-
export LLVM_ROOT=$PWD
88-
popd
89-
fi
90-
9174
if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" ]] ; then
9275
# Lock down icc to 2022.1 because newer versions hosted on the Intel
9376
# repo require a glibc too new for the ASWF CentOS7-based containers

0 commit comments

Comments
 (0)