Skip to content

Commit d24ec33

Browse files
committed
Submodule fix.
Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
1 parent e053ff7 commit d24ec33

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

dali/kernels/slice/slice_cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void SliceKernel(ExecutionEngine &exec_engine,
333333
int nblocks = split_shape(split_factor, out_shape, req_nblocks, min_blk_sz, skip_dim_mask);
334334

335335
if (nblocks == 1) {
336-
exec_engine.AddWork([=](int) {
336+
exec_engine.AddTask([=](int) {
337337
SliceKernel(out_data, in_data, out_strides, in_strides, out_shape, in_shape, args.anchor,
338338
args.step, GetPtr<OutputType>(args.fill_values), args.channel_dim);
339339
}, kSliceCost * volume(out_shape), false); // do not start work immediately

dali/operators/image/color/equalize.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class EqualizeCPU : public Equalize<CPUBackend> {
6969
for (int sample_idx = 0; sample_idx < num_samples; sample_idx++) {
7070
auto out_sample = out_view[sample_idx];
7171
auto in_sample = in_view[sample_idx];
72-
tp.AddWork([this, out_sample, in_sample](int) { RunSample(out_sample, in_sample); },
72+
tp.AddTask([this, out_sample, in_sample](int) { RunSample(out_sample, in_sample); },
7373
in_sample.shape.num_elements());
7474
}
7575
tp.RunAll();

dali/operators/image/convolution/filter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class FilterOpCpuImpl : public OpImplBase<CPUBackend> {
275275
ocv::with_border_handler(
276276
input_desc_.is_valid_mode, border_type_, sample_idx, fill_values, [&](auto ocv_handler) {
277277
for (auto&& views : planes_range) {
278-
tp.AddWork(
278+
tp.AddTask(
279279
[this, views, sample_filter, sample_anchor, ocv_handler](int) {
280280
auto& [sample_out, sample_in] = views;
281281
RunSample(sample_out, sample_filter, sample_in, sample_anchor, ocv_handler);

dali/operators/reader/fits_reader_op.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
// Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ This operator can be used in the following modes:
4343
2. Read file names from a text file indicated in ``file_list`` argument.
4444
3. Read files listed in ``files`` argument.
4545
4. Number of outputs per sample corresponds to the length of ``hdu_indices`` argument. By default,
46-
first HDU with data is read from each file, so the number of outputs defaults to 1.
46+
first HDU with data is read from each file, so the number of outputs defaults to 1.
4747
)")
4848
.NumInput(0)
4949
.OutputFn(detail::FitsReaderOutputFn)
@@ -78,7 +78,7 @@ If ``file_root`` is provided, the paths are treated as being relative to it.
7878
This argument is mutually exclusive with ``file_list``.)",
7979
nullptr)
8080
.AddOptionalArg("hdu_indices",
81-
R"(HDU indices to read. If not provided, the first HDU after the primary
81+
R"(HDU indices to read. If not provided, the first HDU after the primary
8282
will be yielded. Since HDUs are indexed starting from 1, the default value is as follows: hdu_indices = [2].
8383
Size of the provided list hdu_indices defines number of outputs per sample.)",
8484
std::vector<int>{2})
@@ -104,7 +104,7 @@ void FitsReaderCPU::RunImpl(Workspace &ws) {
104104
sample.data[output_idx].nbytes());
105105
};
106106
if (threaded) {
107-
ws.GetThreadPool().AddWork(std::move(copy_task), -file_idx);
107+
ws.GetThreadPool().AddTask(std::move(copy_task), -file_idx);
108108
} else {
109109
copy_task(0);
110110
}

dali/operators/reader/numpy_reader_op.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ void NumpyReaderCPU::Prefetch() {
302302
auto target_mem = static_cast<char*>(tmp_mem.get()) - target_data_offset + read_offset;
303303
// where to read from counting from the file start
304304
auto file_offset = read_offset + align_down(target->data_offset, o_direct_alignm_);
305-
thread_pool_.AddWork([this, &target, file, read_size, target_mem, file_offset, read_tail]
305+
thread_pool_.AddTask([this, &target, file, read_size, target_mem, file_offset, read_tail]
306306
(int tid) {
307307
Index ret = file->ReadAt(target_mem, read_size, file_offset);
308308
DALI_ENFORCE(ret >= static_cast<Index>(read_tail) &&

dali/operators/reader/tfrecord_reader_op.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
1+
// Copyright (c) 2017-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ void TFRecordReader::Prefetch() {
124124
auto idx_loader = dynamic_cast<IndexedFileLoader*>(loader_.get());
125125
while (idx_loader->AnyWorkLeft()) {
126126
auto work = idx_loader->GetReadWork();
127-
thread_pool_.AddWork([work = std::move(work)] (int tid) {
127+
thread_pool_.AddTask([work = std::move(work)] (int tid) {
128128
work();
129129
});
130130
}

third_party/benchmark

Submodule benchmark updated 106 files

third_party/cutlass

Submodule cutlass updated 904 files

0 commit comments

Comments
 (0)