Commit 6279e31f authored by JX's avatar JX 😵
Browse files

Merge remote-tracking branch 'origin/develop'

parents 6928c30c 437f372d
Loading
Loading
Loading
Loading
Loading
+375 −283

File changed.

Preview size limit exceeded, changes collapsed.

−2.54 GiB

File deleted.

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
# can add some of the command-line arguments here as well;
# ok to pass either way or both, as long as they are consistent
work_dir: "/public/home/fangyuedong/project/workplace/"
run_name: "QSO_50sqdeg_test"
run_name: "magnification_test"

# Project cycle and run counter are used to name the outputs
project_cycle: 9
+9 −18
Original line number Diff line number Diff line
#!/bin/bash
#PBS -N C6_TEST
#PBS -l walltime=70:00:00
#PBS -j oe
##PBS -l nodes=wcl-1:ppn=16+wcl-2:ppn=16
#PBS -q batch
#PBS -u fangyuedong

cd $PBS_O_WORKDIR
#SBATCH -J CSSTSim
#SBATCH -N 1
#SBATCH --ntasks-per-node=40
#SBATCH -p debug
#SBATCH --mem=240G

NP=384
hostfile=wcl-1,wcl-2,wcl-3,wcl-4,wcl-5,wcl-6
module load mpi/hpcx/2.4.1/gcc-7.3.1
date

mpirun --oversubscribe -H $hostfile -np $NP python /share/home/fangyuedong/new_sim/csst-simulation/run_sim.py \
    --config_file config_C6.yaml \
    --catalog C6_Catalog \
    -c /share/home/fangyuedong/new_sim/csst-simulation/config

    # --config_file config_50sqdeg.yaml \
    # --catalog C6_50sqdeg \
    # -c /share/home/fangyuedong/new_sim/csst-simulation/config

#限定单节点任务数
srun hostname -s | sort -n | awk -F"-" '{print $2}' | uniq > pnodes

mpirun -mca pml ucx -x  UCX_NET_DEVICES=mlx5_0:1 -machinefile pnodes -np 40 --map-by node python3 /public/home/fangyuedong/project/csst_msc_sim/run_sim.py  --config_file config_overall.yaml --catalog C6_50sqdeg -c /public/home/fangyuedong/project/csst_msc_sim/config
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ setup(name='csst_msc_sim',
          'ObservationSim.Instrument.data.filters': ['*.txt', '*.list', '*.dat'],
          'ObservationSim.Instrument.data.throughputs': ['*.txt', '*.dat'],
          'ObservationSim.Instrument.data.sls_conf': ['*.conf', '*.fits'],
          'ObservationSim.Instrument.data.flatCube': ['*.fits'],
          #   'ObservationSim.Instrument.data.flatCube': ['*.fits'],
          'Catalog.data': ['*.fits', '*.so'],
          'ObservationSim.Config.Header': ['*.fits', '*.lst'],
          'ObservationSim.Straylight.data': ['*.dat'],