CLS-IT/merlin-cryosparc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no cuda changes

Browse Source
This commit is contained in:
assman_g
2024-04-17 13:18:57 +02:00
parent 6b8f9bfe74
commit b1f6ec0643
10 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpu-daily/cluster_info.json
View File

@ -6,6 +6,5 @@
"qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=merlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'",
"qstat_cmd_tpl" : "squeue --cluster=merlin6 -j {{ cluster_job_id }}",
"qdel_cmd_tpl" : "scancel --cluster=merlin6 {{ cluster_job_id }}",
"qinfo_cmd_tpl" : "sinfo --cluster=merlin6",
"transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}"
"qinfo_cmd_tpl" : "sinfo --cluster=merlin6"
}

8
dev/update_versions.sh
View File

@ -14,10 +14,10 @@ fi
# support both cryosparc2_master and cryosparc_master directories
CRYOSPARC_WORKER=$(ls "$CRYOSPARC_HOME"/cryosparc*_worker/bin/cryosparcw | head -1)
echo "Cuda version: ${CUDA_VERSION?Please load the correct cuda module}"
echo "GCC version: ${GCC_VERSION?Please load the correct gcc version}"
#echo "Cuda version: ${CUDA_VERSION?Please load the correct cuda module}"
#echo "GCC version: ${GCC_VERSION?Please load the correct gcc version}"
echo "Worker path: ${CRYOSPARC_WORKER}"
sed -ri 's#cuda/[0-9.]+#cuda/'$CUDA_VERSION'#' */cluster_script.sh
sed -ri 's#gcc/[0-9.]+#gcc/'$GCC_VERSION'#' */cluster_script.sh
#sed -ri 's#cuda/[0-9.]+#cuda/'$CUDA_VERSION'#' */cluster_script.sh
#sed -ri 's#gcc/[0-9.]+#gcc/'$GCC_VERSION'#' */cluster_script.sh
sed -ri 's#worker_bin_path.*#worker_bin_path" : "'$CRYOSPARC_WORKER'",#' */cluster_info.json

3
gpu-big/cluster_info.json
View File

@ -6,6 +6,5 @@
"qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'",
"qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}",
"qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}",
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6",
"transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}"
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6"
}

1
gpu-big/cluster_script.sh
View File

@ -70,7 +70,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print
# Make sure this matches the version of cuda used to compile cryosparc
module purge
module load cuda/11.5.1 gcc/7.5.0
srun {{ run_cmd }}

3
gpu-rtx2080ti/cluster_info.json
View File

@ -6,6 +6,5 @@
"qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'",
"qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}",
"qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}",
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6",
"transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}"
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6"
}

1
gpu-rtx2080ti/cluster_script.sh
View File

@ -67,7 +67,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print
# Make sure this matches the version of cuda used to compile cryosparc
module purge
module load cuda/11.5.1 gcc/7.5.0
srun {{ run_cmd }}

3
gpu-short/cluster_info.json
View File

@ -6,6 +6,5 @@
"qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'",
"qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}",
"qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}",
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6",
"transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}"
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6"
}

1
gpu-short/cluster_script.sh
View File

@ -69,7 +69,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print
# Make sure this matches the version of cuda used to compile cryosparc
module purge
module load cuda/11.5.1 gcc/7.5.0
srun {{ run_cmd }}

3
gpu/cluster_info.json
View File

@ -6,6 +6,5 @@
"qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'",
"qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}",
"qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}",
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6",
"transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}"
"qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6"
}

1
gpu/cluster_script.sh
View File

@ -66,7 +66,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print
# Make sure this matches the version of cuda used to compile cryosparc
module purge
module load cuda/11.5.1 gcc/7.5.0
srun {{ run_cmd }}