diff --git a/infinigen/datagen/configs/data_schema/monocular.gin b/infinigen/datagen/configs/data_schema/monocular.gin index d74e7471..80655c26 100644 --- a/infinigen/datagen/configs/data_schema/monocular.gin +++ b/infinigen/datagen/configs/data_schema/monocular.gin @@ -1,6 +1,7 @@ iterate_scene_tasks.frame_range=[1,48] iterate_scene_tasks.render_frame_range=[48,48] -iterate_scene_tasks.cam_id_ranges = [1,1] +iterate_scene_tasks.n_camera_rigs = 1 +iterate_scene_tasks.n_subcams = 1 iterate_scene_tasks.global_tasks = [ {'name': 'coarse', 'func': @queue_coarse}, diff --git a/infinigen/datagen/configs/data_schema/monocular_video.gin b/infinigen/datagen/configs/data_schema/monocular_video.gin index e99d8b9a..b9d20b0e 100644 --- a/infinigen/datagen/configs/data_schema/monocular_video.gin +++ b/infinigen/datagen/configs/data_schema/monocular_video.gin @@ -1,7 +1,8 @@ iterate_scene_tasks.frame_range = [1, 48] iterate_scene_tasks.view_block_size = 192 iterate_scene_tasks.cam_block_size = 8 -iterate_scene_tasks.cam_id_ranges = [1, 1] +iterate_scene_tasks.n_camera_rigs = 1 +iterate_scene_tasks.n_subcams = 1 iterate_scene_tasks.global_tasks = [ {'name': 'coarse', 'func': @queue_coarse}, diff --git a/infinigen/datagen/configs/data_schema/stereo.gin b/infinigen/datagen/configs/data_schema/stereo.gin index ee28abf5..43bd56ff 100644 --- a/infinigen/datagen/configs/data_schema/stereo.gin +++ b/infinigen/datagen/configs/data_schema/stereo.gin @@ -1,5 +1,6 @@ -iterate_scene_tasks.frame_range=(1, 1) -iterate_scene_tasks.cam_id_ranges =(1, 2) +include 'infinigen/datagen/configs/data_schema/monocular.gin' +iterate_scene_tasks.n_camera_rigs = 1 +iterate_scene_tasks.n_subcams = 2 iterate_scene_tasks.global_tasks = [ {'name': "coarse", 'func': @queue_coarse}, diff --git a/infinigen/datagen/configs/data_schema/stereo_1h_jobs.gin b/infinigen/datagen/configs/data_schema/stereo_1h_jobs.gin index ca353727..d160058f 100644 --- a/infinigen/datagen/configs/data_schema/stereo_1h_jobs.gin +++ b/infinigen/datagen/configs/data_schema/stereo_1h_jobs.gin @@ -1,6 +1,7 @@ iterate_scene_tasks.frame_range=(1, 1) -iterate_scene_tasks.cam_id_ranges =(1, 2) +iterate_scene_tasks.n_camera_rigs = 1 +iterate_scene_tasks.n_subcams = 2 iterate_scene_tasks.global_tasks = [ {'name': "coarse", 'func': @queue_coarse}, diff --git a/infinigen/datagen/configs/data_schema/stereo_video.gin b/infinigen/datagen/configs/data_schema/stereo_video.gin index 48caec7f..5793dabe 100644 --- a/infinigen/datagen/configs/data_schema/stereo_video.gin +++ b/infinigen/datagen/configs/data_schema/stereo_video.gin @@ -1,2 +1,3 @@ include 'infinigen/datagen/configs/data_schema/monocular_video.gin' -iterate_scene_tasks.cam_id_ranges = [1, 2] +iterate_scene_tasks.n_camera_rigs = 1 +iterate_scene_tasks.n_subcams = 2 diff --git a/infinigen/datagen/monitor_tasks.py b/infinigen/datagen/monitor_tasks.py index 8053130b..8eabfa40 100644 --- a/infinigen/datagen/monitor_tasks.py +++ b/infinigen/datagen/monitor_tasks.py @@ -154,7 +154,8 @@ def iterate_scene_tasks( view_dependent_tasks, camera_dependent_tasks, frame_range, - cam_id_ranges, + n_camera_rigs, + n_subcams, point_trajectory_src_frame=1, num_resamples=1, render_frame_range=None, @@ -181,11 +182,8 @@ def iterate_scene_tasks( if cam_block_size is None: cam_block_size = view_block_size - if cam_id_ranges[0] <= 0 or cam_id_ranges[1] <= 0: - raise ValueError( - f"{cam_id_ranges=} is invalid, both num. rigs and " - "num subcams must be >= 1 or no work is done" - ) + assert n_camera_rigs >= 1 + assert n_subcams >= 1 assert view_block_size >= 1 assert cam_block_size >= 1 if cam_block_size > view_block_size: @@ -218,8 +216,8 @@ def iterate_scene_tasks( view_range = render_frame_range if render_frame_range is not None else frame_range view_frames = range(view_range[0], view_range[1] + 1, view_block_size) resamples = range(num_resamples) - cam_rigs = range(cam_id_ranges[0]) - subcams = range(cam_id_ranges[1]) + cam_rigs = range(n_camera_rigs) + subcams = range(n_subcams) running_views = 0 for cam_rig, view_frame in itertools.product(cam_rigs, view_frames):