Commit 4d09f12a authored by Fang Yuedong's avatar Fang Yuedong
Browse files

remove "use_mpi" keyword from overall_config

parent 68c79ee1

ObservationSim/ObservationSim.py

+7 −9
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ class Observation(object): 
        chip_output.Log_info("check running:1: pointing-%d chip-%d pid-%d memory-%6.2fGB"%(pointing.id, chip.chipID, os.getpid(), (psutil.Process(os.getpid()).memory_info().rss / 1024 / 1024 / 1024) ))

        del chip.img



    def runExposure_MPI_PointingList(self, pointing_list, chips=None, use_mpi=False):

        if use_mpi:

    def runExposure_MPI_PointingList(self, pointing_list, chips=None):

        comm = MPI.COMM_WORLD

        ind_thread = comm.Get_rank()

        num_thread = comm.Get_size()
@@ -158,7 +157,7 @@ class Observation(object): 
                run_filts = self.filter_list

                nchips_per_fp = len(self.chip_list)

            else:

                # Only run a particular set of chips (defined in the overall config file)

                # Only run a particular set of chips

                run_chips = []

                run_filts = []

                for ichip in range(len(self.chip_list)):
@@ -171,7 +170,6 @@ class Observation(object): 
            

            for ichip in range(nchips_per_fp):

                i_process = process_counter + ichip

                if use_mpi:

                if i_process % num_thread != ind_thread:

                    continue

                pid = os.getpid()

config/config_50sqdeg.yaml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ run_name: "testRun0" 


# Whether to use MPI

run_option:

  use_mpi: YES

  # NOTE: "n_threads" paramters is currently not used in the backend

  # simulation codes. It should be implemented later in the web frontend

  # in order to config the number of threads to request from NAOC cluster

config/config_C6.yaml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ run_counter: 1 


# Whether to use MPI

run_option:

  use_mpi: NO

  # NOTE: "n_threads" paramters is currently not used in the backend

  # simulation codes. It should be implemented later in the web frontend

  # in order to config the number of threads to request from NAOC cluster

config/config_C6_dev.yaml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ run_counter: 1 


# Whether to use MPI

run_option:

  use_mpi: NO

  # NOTE: "n_threads" paramters is currently not used in the backend

  # simulation codes. It should be implemented later in the web frontend

  # in order to config the number of threads to request from NAOC cluster

config/config_C6_fits.yaml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ run_counter: 1 


# Whether to use MPI

run_option:

  use_mpi: YES

  # NOTE: "n_threads" paramters is currently not used in the backend

  # simulation codes. It should be implemented later in the web frontend

  # in order to config the number of threads to request from NAOC cluster