diff --git a/LifeSciences/eigensoft-7.2.1/build.sh b/LifeSciences/eigensoft-7.2.1/build.sh index 2f4f491f47e77a4328e79983db87f2790204c77d..efda28477e05646603386ad23a4184bef994aeac 100644 --- a/LifeSciences/eigensoft-7.2.1/build.sh +++ b/LifeSciences/eigensoft-7.2.1/build.sh @@ -21,24 +21,13 @@ create_dir() buildpath=$(create_dir $1) installpath=$(create_dir $2) -yum install -y m4 environment-modules systemd-devel -source /etc/profile +yum install -y m4 environment-modules systemd-devel gcc make module purge set -e dep_dir="dependency" bash $dep_dir/bisheng-compiler-2.1.0.sh $buildpath $installpath module use $installpath/bisheng-compiler-2.1.0 -module load $installpath/bisheng-compiler-2.1.0/bisheng_modulefiles - -bash $dep_dir/openblas-0.3.17.sh $buildpath $installpath -module use $installpath/openblas-0.3.17 -module load $installpath/openblas-0.3.17/openblas_modulefiles - - -bash $dep_dir/gsl-2.3.sh $buildpath $installpath -module use $installpath/gsl-2.3 -module load $installpath/gsl-2.3/gsl_modulefiles bash eigensoft-7.2.1.sh $buildpath $installpath @@ -46,14 +35,14 @@ mkdir -p pkg/eigensoft-7.2.1-hpc && cp -r $installpath/* pkg/eigensoft-7.2.1-hpc cat>"pkg/eigensoft-7.2.1-hpc/run.sh"< /dev/null current_dir=\$(cd "\$(dirname "\${BASH_SOURCE[0]}")" &> /dev/null && pwd) for d in \$(ls \$current_dir) do - [[ ! \$d =~ "EIG" && ! -f "\$current_dir/\$d" ]] && cd \$current_dir/\$d && module use \$(pwd) && module load \$(pwd)/*modulefiles + [[ ! -f "\$current_dir/\$d" ]] && cd \$current_dir/\$d && module use \$(pwd) && module load \$(pwd)/*modulefiles done -cd \$current_dir EOF cd pkg/ && tar zcvf eigensoft-7.2.1-hpc.tar.gz eigensoft-7.2.1-hpc diff --git "a/LifeSciences/eigensoft-7.2.1/doc/Devkit\346\212\245\345\221\212/EIGENSOFT-7.2.1 Devkit\350\277\201\347\247\273\344\270\216\350\260\203\344\274\230\346\212\245\345\221\212.docx" "b/LifeSciences/eigensoft-7.2.1/doc/Devkit\346\212\245\345\221\212/EIGENSOFT-7.2.1 Devkit\350\277\201\347\247\273\344\270\216\350\260\203\344\274\230\346\212\245\345\221\212.docx" index 708388d473d603c6d16479437b087be5033c6a9b..ed6734f5b36a7fd0990468296344791e74975152 100644 Binary files "a/LifeSciences/eigensoft-7.2.1/doc/Devkit\346\212\245\345\221\212/EIGENSOFT-7.2.1 Devkit\350\277\201\347\247\273\344\270\216\350\260\203\344\274\230\346\212\245\345\221\212.docx" and "b/LifeSciences/eigensoft-7.2.1/doc/Devkit\346\212\245\345\221\212/EIGENSOFT-7.2.1 Devkit\350\277\201\347\247\273\344\270\216\350\260\203\344\274\230\346\212\245\345\221\212.docx" differ diff --git "a/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" "b/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" index 25c372d516f0f50ae9af7b289fb66717f3eb3080..f5247d51a2d9a2b41ca9d43008477e656c9ee09a 100644 Binary files "a/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" and "b/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\346\265\213\350\257\225\346\212\245\345\221\212.docx" differ diff --git "a/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" "b/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" index b9ff56300ab6a229f639077dcaf075154ccf8d06..b659dce5d4dd9727ec06b463049647b25de0e0e7 100644 Binary files "a/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" and "b/LifeSciences/eigensoft-7.2.1/doc/EIGENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" differ diff --git "a/LifeSciences/eigensoft-7.2.1/doc/~$GENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" "b/LifeSciences/eigensoft-7.2.1/doc/~$GENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" new file mode 100644 index 0000000000000000000000000000000000000000..0e0eeae7fadf6a4e4ef50e37665c5e05e3bb1b72 Binary files /dev/null and "b/LifeSciences/eigensoft-7.2.1/doc/~$GENSOFT-7.2.1\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" differ diff --git a/LifeSciences/eigensoft-7.2.1/eigensoft-7.2.1.sh b/LifeSciences/eigensoft-7.2.1/eigensoft-7.2.1.sh index 4879457d1ee4d00973fb1e97b9ba6fe257d4b43c..829e2f84fc768e8993e5bc3dda999b7d612b856d 100644 --- a/LifeSciences/eigensoft-7.2.1/eigensoft-7.2.1.sh +++ b/LifeSciences/eigensoft-7.2.1/eigensoft-7.2.1.sh @@ -16,7 +16,7 @@ installpath=$2 [[ "$buildpath" =~ .*/$ ]] && buildpath=${buildpath%/*} [[ "$installpath" =~ .*/$ ]] && installpath=${installpath%/*} [[ "$buildpath" == "$installpath" ]] && echo "构建路径与安装路径需为不同路径" && exit 1 -yum install -y wget tar environment-modules +yum install -y wget tar environment-modules gsl gsl-devel openblas openblas-devel set -e wget -t 0 -c -P $buildpath https://github.com/DReichLab/EIG/archive/v7.2.1.tar.gz tar xf $buildpath/v7.2.1.tar.gz -C $buildpath && rm -rf $buildpath/v7.2.1.tar.gz @@ -24,9 +24,24 @@ cd $buildpath/EIG-7.2.1/src export CC=clang export CXX=clang++ export FC=flang -sed -i '12i override CFLAGS += -I'$installpath'/openblas-0.3.17/include -I'$installpath'/gsl-2.3/include' Makefile -sed -i '13i override LDFLAGS += -L'$installpath'/openblas-0.3.17/lib -L'$installpath'/gsl-2.3/lib' Makefile +sed -i '12i override CFLAGS += -I/usr/include -I/usr/include' Makefile +sed -i '13i override LDFLAGS += -L/usr/lib64 -L/usr/lib64' Makefile make make install mkdir -p $installpath/EIG-7.2.1 && cp -r $buildpath/EIG-7.2.1/* $installpath/EIG-7.2.1 +cat>"$installpath/EIG-7.2.1/EIG_modulefiles"<