Skip to content

Chkpt #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
randyspauldingamd wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

Chkpt #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51b1ced
checkpoint
randyspauldingamd Jul 28, 2024
1f1ed93
checkpoint
randyspauldingamd Aug 20, 2024
04ab85c
naive kernel works
randyspauldingamd Aug 21, 2024
7dd8333
cp
randyspauldingamd Aug 26, 2024
ea745ef
fwd works!
randyspauldingamd Aug 30, 2024
2acd214
benchmarking
randyspauldingamd Sep 6, 2024
c5a4b11
fwd naive done
randyspauldingamd Sep 19, 2024
e045420
pr chkpt, pads1,1 broken
randyspauldingamd Oct 8, 2024
98b6daf
cleanup
randyspauldingamd Oct 8, 2024
964bc57
fix build
randyspauldingamd Oct 8, 2024
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
2 changes: 1 addition & 1 deletion include/miopen/miopen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ typedef enum
miopenTensorCHWNc4 = 5, /*!< CHWNc4 memory layout (Partially supported) */
miopenTensorCHWNc8 = 6, /*!< CHWNc8 memory layout (Partially supported) */
miopenTensorNCDHW = 7, /*!< NCDHW memory layout (Fully supported) */
miopenTensorNDHWC = 8, /*!< NCDHW memory layout (Fully supported) */
miopenTensorNDHWC = 8, /*!< NDHWC memory layout (Fully supported) */
} miopenTensorLayout_t;

/*! @ingroup pooling
Expand Down
8 changes: 8 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,14 @@ set( MIOpen_Source
solver/mha/mha_solver_forward.cpp
solver/pooling/forward2d.cpp
solver/pooling/forwardNaive.cpp
solver/pooling/forwardNdNhwcNaive.cpp
solver/pooling/forwardNd.cpp
solver/pooling/forwardCk2d.cpp
solver/pooling/forwardCkNd.cpp
solver/pooling/backward2d.cpp
solver/pooling/backwardNd.cpp
solver/pooling/backwardCk2d.cpp
solver/pooling/backwardCkNd.cpp
solver/reduce/forward_argmax.cpp
solver/reduce/forward_argmin.cpp
solver/reduce/forward_max.cpp
Expand Down Expand Up @@ -447,6 +452,8 @@ if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN
kernels/miopen_type_traits.hpp
kernels/miopen_utility.hpp
kernels/neuron.inc
kernels/pooling_functions.h
include/miopen/pooling/poolingNdNhwcArgs.hpp
kernels/rocm_version.inc
kernels/stride_array.hpp
kernels/utilities.inc
Expand Down Expand Up @@ -495,6 +502,7 @@ if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN
kernels/MIOpenPoolingBwd.cl
kernels/MIOpenPoolingBwdND.cl
kernels/MIOpenPoolingForwardNaive.cl
kernels/MIOpenPoolingForwardNDNhwcNaive.cpp
kernels/MIOpenPoolingND.cl
kernels/MIOpenConv1x1S.cl
kernels/MIOpenConv1x1J1.cl
Expand Down
8 changes: 6 additions & 2 deletions src/comgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,8 +988,12 @@ void BuildHip(const std::string& name,
opts.push_back("-std=c++17");

HiprtcProgram prog(name, text);
prog.Compile(opts);
prog.GetCode(binary);
try{ // TEMPCODE RJS

std::cout << "Compling HIP: '" << name << "'" << std::endl; // TEMPCODE RJS
prog.Compile(opts);
} catch(Error& ex) { std::cout << __FUNCTION__ << " : Exception calling prog.Compile!: " << ex.text << std::endl; throw(ex); }
prog.GetCode(binary);
}
catch(Error& ex)
{
Expand Down
52 changes: 3 additions & 49 deletions src/include/miopen/conv/problem_description.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <miopen/scalar.hpp>

#include <miopen/problem_description_base.hpp>
#include <miopen/problem_description_layout.hpp>
#include <miopen/tensor.hpp>
#include <miopen/convolution.hpp>

Expand Down Expand Up @@ -136,7 +137,7 @@ namespace conv {
MIOPEN_INTERNALS_EXPORT miopenAlphaBetaCase_t ClassifyAlphaBeta(const Scalar& alpha,
const Scalar& beta);

struct MIOPEN_INTERNALS_EXPORT ProblemDescription : ProblemDescriptionBase
struct MIOPEN_INTERNALS_EXPORT ProblemDescription : ProblemDescriptionWeightsBase
#if MIOPEN_ENABLE_SQLITE
,
SQLiteSerializable<ProblemDescription>
Expand All @@ -153,13 +154,8 @@ struct MIOPEN_INTERNALS_EXPORT ProblemDescription : ProblemDescriptionBase
int bias_ = 0,
const Scalar& alpha_ = Scalar(1.0),
const Scalar& beta_ = Scalar(0.0))
: in(in_),
weights(weights_),
out(out_),
: ProblemDescriptionWeightsBase(in_, weights_, out_),
conv(conv_),
in_layout(ComputeInLayout()),
weights_layout(ComputeWeightsLayout()),
out_layout(ComputeOutLayout()),
direction(direction_),
bias(bias_),
alpha(alpha_),
Expand Down Expand Up @@ -443,49 +439,7 @@ struct MIOPEN_INTERNALS_EXPORT ProblemDescription : ProblemDescriptionBase
void SetupFloats(ExecutionContext& ctx) const;

private:
std::string ComputeInLayout() const
{
if(GetSpatialDims() == 2)
{
return in.GetLayout(in.GetLayout_str());
}
else
{
return in.GetLayout("NCDHW");
}
}

std::string ComputeOutLayout() const
{
if(GetSpatialDims() == 2)
{
return out.GetLayout(out.GetLayout_str());
}
else
{
return out.GetLayout("NCDHW");
}
}

std::string ComputeWeightsLayout() const
{
if(GetSpatialDims() == 2)
{
return weights.GetLayout(weights.GetLayout_str());
}
else
{
return weights.GetLayout("NCDHW");
}
}

TensorDescriptor in;
TensorDescriptor weights;
TensorDescriptor out;
ConvolutionDescriptor conv;
std::string in_layout;
std::string weights_layout;
std::string out_layout;
Direction direction = Direction::Forward;
int bias = 0;
Scalar alpha = Scalar(1.0);
Expand Down
3 changes: 3 additions & 0 deletions src/include/miopen/kernel_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ struct KernelInfo
fs::path kernel_file;
std::string kernel_name;
friend std::ostream& operator<<(std::ostream& os, const KernelInfo& k);

/// configures the working set using hip-style indices
void ConfigureHip(size_t l0, size_t l1, size_t l2, size_t g0, size_t g1, size_t g2);
};

std::vector<Program> PrecompileKernels(const Handle& h,
Expand Down
2 changes: 2 additions & 0 deletions src/include/miopen/pooling.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ struct MIOPEN_EXPORT PoolingDescriptor : miopenPoolingDescriptor
void SetWorkspaceIndexMode(miopenPoolingWorkspaceIndexMode_t workspace_index);

miopenPoolingMode_t GetMode() const;

bool ModeIsAveraging() const;

miopenPaddingMode_t GetPaddingMode() const;

Expand Down
45 changes: 45 additions & 0 deletions src/include/miopen/pooling/poolingNdNhwcArgs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#pragma once

struct poolingNdNhwcArgs
{
uint32_t filter_d;
uint32_t filter_h;
uint32_t filter_w;

uint32_t filter_d_stride;
uint32_t filter_h_stride;
uint32_t filter_w_stride;

uint32_t filter_d_pad;
uint32_t filter_h_pad;
uint32_t filter_w_pad;

uint32_t all_n;
uint32_t all_c;

uint32_t bot_d;
uint32_t bot_h;
uint32_t bot_w;

uint32_t bot_n_stride;
uint32_t bot_c_stride;
uint32_t bot_d_stride;
uint32_t bot_h_stride;
uint32_t bot_w_stride;

uint32_t top_d;
uint32_t top_h;
uint32_t top_w;

uint32_t top_n_stride;
uint32_t top_c_stride;
uint32_t top_d_stride;
uint32_t top_h_stride;
uint32_t top_w_stride;

uint32_t mask_n_stride;
uint32_t mask_c_stride;
uint32_t mask_d_stride;
uint32_t mask_h_stride;
uint32_t mask_w_stride;
};
60 changes: 60 additions & 0 deletions src/include/miopen/pooling/solvers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,30 @@ struct PoolingForwardNd final : PoolingSolver
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingForwardCk2d final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingForwardCk2d>(); }

bool IsApplicable(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
ConvSolution GetSolution(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
std::size_t GetWorkspaceSize(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingForwardCkNd final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingForwardCkNd>(); }

bool IsApplicable(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
ConvSolution GetSolution(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
std::size_t GetWorkspaceSize(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingForwardNaive final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingForwardNaive>(); }
Expand All @@ -79,6 +103,18 @@ struct PoolingForwardNaive final : PoolingSolver
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingForwardNDNhwcNaive final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingForwardNDNhwcNaive>(); }

bool IsApplicable(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
ConvSolution GetSolution(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
std::size_t GetWorkspaceSize(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
};

template <class Inner>
struct PoolingFwdNCHWTransposingSolver : TransposingSolver<PoolingFwdNCHWTransposingSolver<Inner>,
PoolingSolver,
Expand Down Expand Up @@ -145,6 +181,18 @@ struct PoolingBackward2d final : PoolingSolver
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingBackwardCk2d final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingBackwardCk2d>(); }

bool IsApplicable(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
ConvSolution GetSolution(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
std::size_t GetWorkspaceSize(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingBackwardNd final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingBackwardNd>(); }
Expand All @@ -157,6 +205,18 @@ struct PoolingBackwardNd final : PoolingSolver
const miopen::pooling::ProblemDescription& problem) const override;
};

struct PoolingBackwardCkNd final : PoolingSolver
{
const std::string& SolverDbId() const override { return GetSolverDbId<PoolingBackwardCkNd>(); }

bool IsApplicable(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
ConvSolution GetSolution(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
std::size_t GetWorkspaceSize(const ExecutionContext& context,
const miopen::pooling::ProblemDescription& problem) const override;
};

template <class Inner>
struct PoolingBwdNCHWTransposingSolver : TransposingSolver<PoolingBwdNCHWTransposingSolver<Inner>,
PoolingSolver,
Expand Down
102 changes: 102 additions & 0 deletions src/include/miopen/problem_description_layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/*******************************************************************************
*
* MIT License
*
* Copyright (c) 2022 Advanced Micro Devices, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*******************************************************************************/

#pragma once

#include <miopen/miopen.h>
#include <miopen/names.hpp>
#include <miopen/problem_description_base.hpp>
#include <miopen/tensor.hpp>

#include <string>

namespace miopen {

struct ProblemDescriptionLayoutBase : ProblemDescriptionBase
{
ProblemDescriptionLayoutBase() = default;
ProblemDescriptionLayoutBase(const ProblemDescriptionLayoutBase&) = default;
ProblemDescriptionLayoutBase(const TensorDescriptor& in_, // x for Forward, y for Backward*
const TensorDescriptor& out_ // y for Forward, x for Backward*
)
: ProblemDescriptionBase(),
in(in_),
out(out_),
in_layout(ComputeInLayout()),
out_layout(ComputeOutLayout())
{}
virtual ~ProblemDescriptionLayoutBase() = default;

ProblemDescriptionLayoutBase& operator=(const ProblemDescriptionLayoutBase&) = default;

[[nodiscard]] virtual NetworkConfig MakeNetworkConfig() const = 0;

protected:
TensorDescriptor in;
TensorDescriptor out;
std::string in_layout;
std::string out_layout;

std::string ComputeInLayout() const
{
return in.GetLayout(in.GetLayout_str());
}

std::string ComputeOutLayout() const
{
return out.GetLayout(out.GetLayout_str());
}
};

struct ProblemDescriptionWeightsBase : ProblemDescriptionLayoutBase
{
ProblemDescriptionWeightsBase() = default;
ProblemDescriptionWeightsBase(const ProblemDescriptionWeightsBase&) = default;
ProblemDescriptionWeightsBase(const TensorDescriptor& in_, // x for Forward, y for Backward*
const TensorDescriptor& weights_,
const TensorDescriptor& out_ // y for Forward, x for Backward*
)
: ProblemDescriptionLayoutBase(in_, out_),
weights(weights_),
weights_layout(ComputeWeightsLayout())
{}
virtual ~ProblemDescriptionWeightsBase() = default;

ProblemDescriptionWeightsBase& operator=(const ProblemDescriptionWeightsBase&) = default;

[[nodiscard]] virtual NetworkConfig MakeNetworkConfig() const = 0;

protected:
TensorDescriptor weights;
std::string weights_layout;

std::string ComputeWeightsLayout() const
{
return weights.GetLayout(weights.GetLayout_str());
}
};

} // namespace miopen
Loading