Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Fix build #82

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/CPP/tensor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <iostream>
#include <numeric>
#include <algorithm>
#include <limits>
#include <sstream>

namespace cldnn
Expand Down
2 changes: 2 additions & 0 deletions common/khronos_ocl_clhpp/cl2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1896,6 +1896,7 @@ struct ImageFormat : public cl_image_format
image_channel_data_type = type;
}

#if 0
//! \brief Assignment operator.
ImageFormat& operator = (const ImageFormat& rhs)
{
Expand All @@ -1905,6 +1906,7 @@ struct ImageFormat : public cl_image_format
}
return *this;
}
#endif
};

/*! \brief Class interface for cl_device_id.
Expand Down
3 changes: 2 additions & 1 deletion kernel_selector/common/tensor_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <assert.h>
#include <numeric>
#include <cstddef>
#include <stdexcept>
#include <algorithm>
#include <array>

Expand Down Expand Up @@ -541,4 +542,4 @@ namespace kernel_selector
static std::array<std::array<int, 7>, WeightsLayout::WeightsLayoutCount> weightsChannelArray;
};
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace kernel_selector
runInfo->lws1 = 1;
runInfo->lws2 = sub_group_size;

return std::move(runInfo);
return runInfo;
}

JitConstants FullyConnectedKernelMMAD::GetJitConstants(const fully_connected_params& params, const DispatchData& runInfo) const
Expand Down Expand Up @@ -86,4 +86,4 @@ namespace kernel_selector
}
return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace kernel_selector
}
dispatchData->lws1 = dispatchData->lws2 = 1;

return std::move(dispatchData);
return dispatchData;
}

KernelsData FullyConnectedKernelBase::GetCommonKernelsData(const Params& params, const optional_params& options, DataLayout dl, std::vector<WeightsLayout> wl, float estimated_time, const std::string exeMode, int autoTuneIndex) const
Expand Down Expand Up @@ -144,4 +144,4 @@ namespace kernel_selector
return GetCommonKernelsData(params, options, dl, wl, estimated_time, GetAutoTuneOptions(autoTuneIndex), autoTuneIndex);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace kernel_selector {

runInfo->effiency = FORCE_PRIORITY_6;

return std::move(runInfo);
return runInfo;
}

JitConstants FullyConnected_bf_io_GEMM::GetJitConstants(const fully_connected_params& params, const DispatchData& kd) const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace kernel_selector
}
}

return std::move(kd);
return kd;
}

bool FullyConnected_bf_io_input_spatial::Validate(const Params& p, const optional_params& o) const
Expand Down Expand Up @@ -122,4 +122,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace kernel_selector
runInfo->lws1 = local[1];
runInfo->lws2 = 1;

return std::move(runInfo);
return runInfo;
}

KernelsData FullyConnected_bfyx_Ref::GetKernelsData(const Params& params, const optional_params& options) const
Expand All @@ -80,4 +80,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace kernel_selector
kd->lws0 = 16;
kd->lws1 = 1;

return std::move(kd);
return kd;
}

static bool check_input_layout(const DataTensor& t)
Expand Down Expand Up @@ -97,4 +97,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace kernel_selector
kd->in_chunk_prefetch_size = 2;
kd->filter_chunk_prefetch_size = responses_per_sg_exec;

return std::move(run_info);
return run_info;
}

KernelsData FullyConnected_bs_f_bsv16_b1::GetKernelsData(const Params& params, const optional_params& optParams) const
Expand All @@ -109,4 +109,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace kernel_selector
kd->lws0 = 8;
kd->lws1 = 1;

return std::move(kd);
return kd;
}

static bool check_input_layout(const DataTensor& t)
Expand Down Expand Up @@ -113,4 +113,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace kernel_selector
kd->lws0 = 8;
kd->lws1 = 1;

return std::move(kd);
return kd;
}

bool FullyConnected_fb_io_b8_f8::Validate(const Params& p, const optional_params& o) const
Expand Down Expand Up @@ -97,4 +97,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace kernel_selector
kd->units_per_sg_read = units_per_sg_read;
kd->rg_count = (uint32_t)rg_count;
kd->last_rg_size = response_size % units_per_sg_read;
return std::move(kd);
return kd;
}

JitConstants FullyConnected_fb_io_block::GetJitConstants(const fully_connected_params& params, const FullyConnectedKernelBase::DispatchData& run_info) const
Expand Down Expand Up @@ -159,4 +159,4 @@ namespace kernel_selector

return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace kernel_selector
kd->lws0 = 8;
kd->lws1 = 1;

return std::move(kd);
return kd;
}

bool FullyConnected_fb_oi_b8_ref::Validate(const Params& p, const optional_params& o) const
Expand Down Expand Up @@ -77,4 +77,4 @@ namespace kernel_selector
}
return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace kernel_selector {

runInfo->effiency = FORCE_PRIORITY_5;

return std::move(runInfo);
return runInfo;
}

JitConstants FullyConnected_fs_byx_fsv32::GetJitConstants(const fully_connected_params& params, const DispatchData& kd) const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace kernel_selector
runInfo->lws1 = 1;
runInfo->lws2 = 1;

return std::move(runInfo);
return runInfo;
} // SetDefault

bool FullyConnectedKernelIMAD::Validate(const Params& params, const optional_params& options) const
Expand Down Expand Up @@ -113,4 +113,4 @@ namespace kernel_selector
}
return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace kernel_selector

runInfo->effiency = TUTORIAL_PRIORITY;

return std::move(runInfo);
return runInfo;
}

KernelsData FullyConnected_image_tutorial::GetKernelsData(const Params& params, const optional_params& options) const
Expand All @@ -74,4 +74,4 @@ namespace kernel_selector
}
return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace kernel_selector
runInfo->lws2 = 1;

runInfo->effiency = FORCE_PRIORITY_1;
return std::move(runInfo);
return runInfo;
}

KernelsData FullyConnected_mmad_batched::GetKernelsData(const Params& params, const optional_params& options) const
Expand All @@ -122,4 +122,4 @@ namespace kernel_selector
}
return res;
}
}
}
3 changes: 2 additions & 1 deletion kernel_selector/core/common/primitive_db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
// limitations under the License.
*/
#include "primitive_db.h"
#include <assert.h>
#include <cassert>
#include <algorithm>
#include <stdexcept>

#ifndef NDEBUG
#include <fstream>
Expand Down
6 changes: 3 additions & 3 deletions src/gpu/kernels_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ namespace {
undefs += "#endif\n";
}

return std::move(undefs);
return undefs;
}

std::string reorder_options(const std::string& org_options)
Expand Down Expand Up @@ -181,7 +181,7 @@ kernels_cache::sorted_code kernels_cache::get_program_source(const kernels_code&
current_bucket.kernels_counter++;
}

return std::move(scode);
return scode;
}

kernels_cache::kernels_cache(gpu_toolkit& context): _context(context) {}
Expand Down Expand Up @@ -354,4 +354,4 @@ void kernels_cache::build_all()
}

}}


2 changes: 1 addition & 1 deletion src/include/generic_layer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct generic_layer : public primitive_base<generic_layer, CLDNN_PRIMITIVE_DESC
generic_layer(const dto* dto)
: primitive_base(dto)
, output_layout(dto->output_layout)
, generic_params(*static_cast<const kernel_selector::generic_kernel_params* const>(dto->generic_params))
, generic_params(*static_cast<const kernel_selector::GenericKernelParams*>(dto->generic_params))
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/program.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ std::string program_impl::get_memory_dependencies_string() const
itr++;
mem_dep = mem_dep.append("primitive: ").append(node->id()).append(" restricted list: ");
for (auto it : node->get_memory_dependencies())
mem_dep == mem_dep.append(it).append(", ");
mem_dep = mem_dep.append(it).append(", ");
mem_dep = mem_dep.append("\n");
}
return mem_dep;
Expand Down