Skip to content

Commit bc7c74a

Browse files
authored
deprecate log_path with log_dir in launch scripts (#1551)
1 parent 4b3793d commit bc7c74a

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

intel_extension_for_pytorch/cpu/launch/__main__.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def add_deprecated_params(parser):
130130
group.add_argument('--disable_numactl', action='store_true', default=False, help='Deprecated by --multi-task-manager.')
131131
group.add_argument('--disable_taskset', action='store_true', default=False, help='Deprecated by --multi-task-manager.')
132132
group.add_argument('--disable_iomp', action='store_true', default=False, help='Deprecated by --omp-runtime.')
133+
group.add_argument('--log_path', type=str, default='', help='Deprecated by --log-dir.')
133134
group.add_argument('--multi_instance', action='store_true', default=False, help='Deprecated. Will be removed.')
134135
group.add_argument('--distributed', action='store_true', default=False, help='Deprecated. Will be removed.')
135136

@@ -155,6 +156,9 @@ def process_deprecated_params(args, logger):
155156
if args.use_logical_core:
156157
logger.warning('Argument --use_logical_core is deprecated by --use-logical-cores.')
157158
args.use_logical_cores = args.use_logical_core
159+
if args.log_path != '':
160+
logger.warning('Argument --log_path is deprecated by --log-dir.')
161+
args.log_dir = args.log_path
158162

159163
if args.multi_instance:
160164
logger.info('Argument --multi_instance is deprecated. Will be removed. If you are using the deprecated argument, please update it to the new one.')
@@ -251,8 +255,8 @@ def parse_args():
251255
)
252256

253257
parser.add_argument(
254-
'--log-path',
255-
'--log_path',
258+
'--log-dir',
259+
'--log_dir',
256260
default='',
257261
type=str,
258262
help='The log file directory. Setting it to empty disables logging to files.',
@@ -299,14 +303,14 @@ def main():
299303

300304
args = parser.parse_args()
301305
process_deprecated_params(args, logger)
302-
if args.log_path:
303-
path = os.path.dirname(args.log_path if args.log_path.endswith('/') else f'{args.log_path}/')
306+
if args.log_dir:
307+
path = os.path.dirname(args.log_dir if args.log_dir.endswith('/') else f'{args.log_dir}/')
304308
if not os.path.exists(path):
305309
os.makedirs(path)
306-
args.log_path = path
310+
args.log_dir = path
307311

308312
args.log_file_prefix = f'{args.log_file_prefix}_{datetime.now().strftime("%Y%m%d%H%M%S")}'
309-
fileHandler = logging.FileHandler(f'{args.log_path}/{args.log_file_prefix}_instances.log')
313+
fileHandler = logging.FileHandler(f'{args.log_dir}/{args.log_file_prefix}_instances.log')
310314
logFormatter = logging.Formatter(format_str)
311315
fileHandler.setFormatter(logFormatter)
312316
logger.addHandler(fileHandler)

intel_extension_for_pytorch/cpu/launch/launcher_distributed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ def launch(self, args):
185185
cmd.append(args.program)
186186
cmd.extend(args.program_args)
187187
log_name = f'{args.log_file_prefix}.log'
188-
log_name = os.path.join(args.log_path, log_name)
188+
log_name = os.path.join(args.log_dir, log_name)
189189
cmd_s = ' '.join(cmd)
190-
if args.log_path:
190+
if args.log_dir:
191191
cmd_s = f'{cmd_s} 2>&1 | tee {log_name}'
192192
self.verbose('info', cmd_s)
193193
process = subprocess.Popen(cmd_s, env=os.environ, shell=True)

intel_extension_for_pytorch/cpu/launch/launcher_multi_instances.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ def execution_command_builder(self, args, task_mgr, cpu_pools, index):
158158
cmd.append('-m')
159159
cmd.append(args.program)
160160
log_name = f'{args.log_file_prefix}_instance_{index}_cores_{cores_list_local.replace(",", "_")}.log'
161-
log_name = os.path.join(args.log_path, log_name)
161+
log_name = os.path.join(args.log_dir, log_name)
162162
cmd.extend(args.program_args)
163163
os.environ['LAUNCH_CMD'] += '{" ".join(cmd)},#'
164164
cmd_s = ' '.join(cmd)
165-
if args.log_path:
165+
if args.log_dir:
166166
cmd_s = f'{cmd_s} 2>&1 | tee {log_name}'
167167
self.verbose('info', cmd_s)
168168
if len(set([c.node for c in pool])) > 1:

0 commit comments

Comments
 (0)