diff --git a/BasicScientficResearch/cp2k-7.1.0/dependency/libint-2.6.0.sh b/BasicScientficResearch/cp2k-7.1.0/dependency/libint-2.6.0.sh index 14bba6648c2dbf7eeb887efafa3cf0bbdd3a5750..2bcdaf6aa0371133e4e4817f7a143f05610a859d 100644 --- a/BasicScientficResearch/cp2k-7.1.0/dependency/libint-2.6.0.sh +++ b/BasicScientficResearch/cp2k-7.1.0/dependency/libint-2.6.0.sh @@ -25,14 +25,15 @@ do cnt=$[$cnt+1] else echo "下载libint源码包成功" + tar -xvf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz -C $buildpath && rm -rf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz break - fi + fi done if [ $cnt -eq $number ];then echo "下载libint源码包失败,将dependency/src目录下的离线包拷贝并解压到构建目录下" cp dependency/src/libint-v2.6.0-cp2k-lmax-6.tgz $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz - tar -xvf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz -C $buildpath && rm -rf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz + tar -xvf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz -C $buildpath && rm -rf $buildpath/libint-v2.6.0-cp2k-lmax-6.tgz fi set -e } diff --git a/LifeSciences/openCV-4.5.5/build.sh b/LifeSciences/openCV-4.5.5/build.sh index df9c9a92bf9f9f7a0273e696c102beb2ea6e4115..06ff341f309ea6b40df85e97d9606449c345812d 100644 --- a/LifeSciences/openCV-4.5.5/build.sh +++ b/LifeSciences/openCV-4.5.5/build.sh @@ -38,9 +38,9 @@ sudo yum install -y \ m4 environment-modules systemd-devel patch autoconf \ automake libtool python python-devel python-setuptools \ python3-devel python3-pip \ - wget tar libatomic gcc-c++ \ + wget tar cmake libatomic gcc-c++ \ python3 python3-numpy libjpeg libtiff giflib \ - gstreamer* libgtk* gtk2-devel libxvidcore* libx264* \ + gstreamer* libgtk* gtk2-devel libxvidcore* libx264* qt5-qttools qt5-qtbase \ libgtk-3* gtk3-devel tbb openblas lapack jasper hdf5-devel protobuf source /etc/profile diff --git "a/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" "b/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" index 6e9be48ed5de6c8afc6a46cbaf652db08b708d02..4d8830c96bd641ab820c452cb7d88ac8d3e5945e 100644 Binary files "a/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" and "b/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" differ diff --git "a/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" "b/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" index e1641f82febf484d35488006a2b1d9c09a6e79ae..26844f8174b3b74ebfe637409e5668d6bea15efe 100644 Binary files "a/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" and "b/LifeSciences/openCV-4.5.5/doc/OpenCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" differ diff --git "a/LifeSciences/openCV-4.5.5/doc/~$enCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" "b/LifeSciences/openCV-4.5.5/doc/~$enCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" deleted file mode 100644 index fd3f79103e88ffd67865602b95e5c73e97a68f7b..0000000000000000000000000000000000000000 Binary files "a/LifeSciences/openCV-4.5.5/doc/~$enCV-4.5.5\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" and /dev/null differ