Merge branch 'pointwise-nhwc' of...

Merge branch 'pointwise-nhwc' of https://github.com/ROCmSoftwarePlatform/AMDMIGraphX into nhwc_workaround

.github/workflows/ci.yaml

@@ -18,19 +18,8 @@ jobs:
         with:
           access_token: ${{ github.token }}
   tidy:
-    runs-on: ubuntu-20.04
-
-    steps:
-    - name: Free space
-      uses: jlumbroso/free-disk-space@main
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        swap-storage: true
-
+    runs-on: ROCM-Ubuntu
+    steps: 
     - uses: actions/checkout@v3
 
     # In this step, this action saves a list of existing images,
@@ -71,7 +60,7 @@ jobs:
           -DCLANG_TIDY_DEPEND_ON_TARGET=Off \
           -DCLANG_TIDY_CACHE=/data/tidy-cache \
           ..
-        make -j2 -k onnx-proto tf-proto tidy
+        make -j$(nproc) -k onnx-proto tf-proto tidy
 
     # GH actions can not update existing cache, as a workaround clear cache and then save it
     - name: Clear tidy cache before saving
@@ -93,20 +82,8 @@ jobs:
 
 
   cppcheck:
-    runs-on: ubuntu-20.04
-
+    runs-on: ROCM-Ubuntu
     steps:
-    - name: Free space
-      uses: jlumbroso/free-disk-space@main
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        swap-storage: true
-
-
     - uses: actions/checkout@v3
 
     # In this step, this action saves a list of existing images,
@@ -142,7 +119,7 @@ jobs:
           -DBUILD_DEV=On \
           -DROCM_ENABLE_GH_ANNOTATIONS=On \
           ..
-        make -j2 cppcheck
+        make -j$(nproc) cppcheck
 
     # GH actions can not update existing cache, as a workaround clear cache and then save it
     - name: Clear cppcheck cache before saving
@@ -164,18 +141,8 @@ jobs:
 
 
   format:
-    runs-on: ubuntu-20.04
-
+    runs-on: ROCM-Ubuntu
     steps:
-    - name: Free space
-      uses: jlumbroso/free-disk-space@main
-      with:
-        tool-cache: true
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        swap-storage: true
     - uses: actions/checkout@v3
 
     # In this step, this action saves a list of existing images,
@@ -224,6 +191,7 @@ jobs:
         haskell: true
         large-packages: true
         swap-storage: true
+        docker-images: true
 
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -253,6 +221,7 @@ jobs:
         haskell: true
         large-packages: true
         swap-storage: true
+        docker-images: true
 
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -292,6 +261,7 @@ jobs:
         haskell: true
         large-packages: true
         swap-storage: true
+        docker-images: true
 
     - name : Install rbuild and lld
       run: |
@@ -408,6 +378,7 @@ jobs:
         haskell: true
         large-packages: true
         swap-storage: true
+        docker-images: true
 
     - uses: actions/checkout@v3
     - name: Set up Python

CMakeLists.txt

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #####################################################################################
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     message(FATAL_ERROR "The binary and source directroy cannot be the same")
@@ -91,12 +91,6 @@ set(MIGRAPHX_ENABLE_FPGA Off CACHE BOOL "")
 set(CMAKE_CXX_STANDARD_DEFAULT "")
 add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
 
-if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
-    set(CONFIGURE_DEPENDS)
-else()
-    set(CONFIGURE_DEPENDS CONFIGURE_DEPENDS)
-endif()
-
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(EnableCompilerWarnings)
 include(ROCMClangTidy)

cmake/ExportHeader.cmake

+#####################################################################################
+# The MIT License (MIT)
+#
+# Copyright (c) 2015-2022 Advanced Micro Devices, Inc. All rights reserved.
+#
+# 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.
+#####################################################################################
+
+if(COMMAND migraphx_generate_export_header)
+    return()
+endif()
+
+include(GenerateExportHeader)
+
+function(migraphx_generate_export_header TARGET)
+    cmake_parse_arguments(PARSE "" "DIRECTORY" "" ${ARGN})
+    if(PARSE_DIRECTORY)
+        set(__directory ${PARSE_DIRECTORY})
+    else()
+        string(REPLACE "_" "/" __directory ${TARGET})
+        string(TOLOWER ${__directory} __directory)
+    endif()
+    set(__file_name ${CMAKE_CURRENT_BINARY_DIR}/include/${__directory}/export.h)
+    generate_export_header(${TARGET} EXPORT_FILE_NAME ${__file_name})
+    target_include_directories(${TARGET} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
+    rocm_install(FILES ${__file_name} DESTINATION include/${__directory})
+endfunction()

docs/reference/py.rst

@@ -151,6 +151,15 @@ argument
 
     :rtype: argument
 
+.. py:function:: create_argument(s, values)
+
+    Create an argument of shape s with a set of values.
+
+    :param shape s: Shape of argument to create.
+    :param list values: Values to put in the argument. Must be the same number of elements as the shape.
+
+    :rtype: argument
+
 .. py:function:: argument_from_pointer(shape, address)
 
     Create argument from data stored in given address without copy.

src/CMakeLists.txt

@@ -22,6 +22,8 @@
 # THE SOFTWARE.
 #####################################################################################
 
+include(ExportHeader)
+
 include(ROCMInstallTargets)
 include(ROCMPackageConfigHelpers)
 include(RegisterOp)
@@ -128,9 +130,9 @@ register_migraphx_ops(
     contiguous
     convert
     convolution
+    convolution_backwards
     cosh
     cos
-    deconvolution
     dequantizelinear
     div
     dot
@@ -252,6 +254,7 @@ target_link_libraries(migraphx PUBLIC Threads::Threads)
 
 find_package(nlohmann_json 3.8.0 REQUIRED)
 target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json)
+migraphx_generate_export_header(migraphx)
 
 find_package(PkgConfig)
 pkg_check_modules(SQLITE3 REQUIRED IMPORTED_TARGET sqlite3)

src/include/migraphx/adjust_allocation.hpp

@@ -32,7 +32,7 @@ inline namespace MIGRAPHX_INLINE_NS {
 
 struct module;
 
-struct adjust_allocation
+struct MIGRAPHX_EXPORT adjust_allocation
 {
     allocation_model model;
     std::string name() const { return "adjust_allocation"; }

src/include/migraphx/allocation_model.hpp

@@ -60,7 +60,7 @@ struct allocation_model
 #ifdef TYPE_ERASED_DECLARATION
 
 // Type-erased interface for:
-struct allocation_model
+struct MIGRAPHX_EXPORT allocation_model
 {
     //
     std::string name() const;

src/include/migraphx/analyze_streams.hpp

@@ -39,7 +39,8 @@ struct stream_race
     instruction_ref before;
 };
 
-std::vector<stream_race> analyze_streams(const module& m, const stream_model& strmm);
+MIGRAPHX_EXPORT std::vector<stream_race> analyze_streams(const module& m,
+                                                         const stream_model& strmm);
 
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/include/migraphx/apply_alpha_beta.hpp

@@ -33,6 +33,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
+MIGRAPHX_EXPORT
 instruction_ref insert_apply_alpha_beta(module& m,
                                         instruction_ref pos,
                                         const std::vector<instruction_ref>& args,

src/include/migraphx/argument.hpp

@@ -42,7 +42,7 @@ inline namespace MIGRAPHX_INLINE_NS {
  * or it can be owned by the argument.
  *
  */
-struct argument : raw_data<argument>
+struct MIGRAPHX_EXPORT argument : raw_data<argument>
 {
     argument() = default;
 
@@ -93,6 +93,16 @@ struct argument : raw_data<argument>
     /// Return the ith element
     argument element(std::size_t i) const;
 
+    // Keeps the same data ordering as the given container
+    template <class Iterator>
+    void fill(Iterator start, Iterator end)
+    {
+        assert(std::distance(start, end) <= m_shape.elements());
+        this->visit([&](auto output) {
+            std::copy(start, end, output.begin());
+        });
+    }
+
     private:
     void assign_buffer(std::function<char*()> d);
     struct data_t
@@ -107,9 +117,9 @@ struct argument : raw_data<argument>
     data_t m_data{};
 };
 
-std::vector<shape> to_shapes(const std::vector<argument>& args);
-void migraphx_to_value(value& v, const argument& a);
-void migraphx_from_value(const value& v, argument& a);
+MIGRAPHX_EXPORT std::vector<shape> to_shapes(const std::vector<argument>& args);
+MIGRAPHX_EXPORT void migraphx_to_value(value& v, const argument& a);
+MIGRAPHX_EXPORT void migraphx_from_value(const value& v, argument& a);
 
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/include/migraphx/auto_contiguous.hpp

@@ -33,7 +33,7 @@ inline namespace MIGRAPHX_INLINE_NS {
 
 struct module;
 
-struct auto_contiguous
+struct MIGRAPHX_EXPORT auto_contiguous
 {
     std::string name() const { return "auto_contiguous"; }
     void apply(module& m) const;

src/include/migraphx/common.hpp

@@ -54,21 +54,26 @@ struct operation;
  * s0 = (4, 1, 1) and s1 = (3, 4)
  * output_lens = (4, 3, 4)
  */
+MIGRAPHX_EXPORT
 std::vector<std::size_t> compute_broadcasted_lens(std::vector<std::size_t> s0,
                                                   std::vector<std::size_t> s1);
 
+MIGRAPHX_EXPORT
 std::vector<shape::dynamic_dimension> compute_broadcasted_dyn_dims(shape s0, shape s1);
 
+MIGRAPHX_EXPORT
 shape common_shape(const std::vector<shape>& shapes);
 
 /**
  * @brief Compute the common (broadcasted) dimensions of a list of fixed shapes
  */
+MIGRAPHX_EXPORT
 std::vector<std::size_t> compute_common_lens(const std::vector<shape>& shapes);
 
 /**
  * @ brief Compute the common (broadcasted) dynamic dimensions of a list of dynamic shapes
  */
+MIGRAPHX_EXPORT
 std::vector<shape::dynamic_dimension> compute_common_dyn_dims(const std::vector<shape>& shapes);
 
 /**
@@ -83,11 +88,13 @@ std::vector<shape::dynamic_dimension> compute_common_dyn_dims(const std::vector<
  *                  attached to each instruction_ref are considered for broadcasting
  * @return std::vector<instruction_ref>   a modified argument list
  */
-std::vector<instruction_ref>
+MIGRAPHX_EXPORT std::vector<instruction_ref>
 insert_common_args(module& m, instruction_ref ins, std::vector<instruction_ref> inputs);
 
+MIGRAPHX_EXPORT
 std::vector<instruction_ref> add_common_args(module& m, std::vector<instruction_ref> inputs);
 
+MIGRAPHX_EXPORT
 instruction_ref insert_common_op(module& m,
                                  instruction_ref ins,
                                  const operation& op,
@@ -96,6 +103,7 @@ instruction_ref insert_common_op(module& m,
 /**
  * @brief Wrapper for insert_common_args() which inserts operation at the end of the module.
  */
+MIGRAPHX_EXPORT
 instruction_ref add_common_op(module& m, const operation& op, std::vector<instruction_ref> inputs);
 
 } // namespace MIGRAPHX_INLINE_NS

src/include/migraphx/compile_src.hpp

@@ -41,7 +41,7 @@ struct src_file
     std::size_t len() const { return content.second - content.first; }
 };
 
-struct src_compiler
+struct MIGRAPHX_EXPORT src_compiler
 {
     std::string compiler                      = "c++";
     std::string flags                         = "";

src/include/migraphx/concat_opt.hpp

@@ -56,7 +56,7 @@ struct concat_optimization
 #ifdef TYPE_ERASED_DECLARATION
 
 // Type-erased interface for:
-struct concat_optimization
+struct MIGRAPHX_EXPORT concat_optimization
 {
     //
     std::string name() const;

src/include/migraphx/config.hpp

@@ -24,6 +24,8 @@
 #ifndef MIGRAPHX_GUARD_CONFIG_HPP
 #define MIGRAPHX_GUARD_CONFIG_HPP
 
+#include <migraphx/export.h>
+
 #if !defined(MIGRAPHX_USE_CLANG_TIDY) && !defined(DOXYGEN)
 
 #ifdef BUILD_DEV

src/include/migraphx/context.hpp

@@ -80,7 +80,7 @@ void finish_on_context(T&, any_ptr)
 #ifdef TYPE_ERASED_DECLARATION
 
 // Type-erased interface for:
-struct context
+struct MIGRAPHX_EXPORT context
 {
     // (optional)
     value to_value() const;

src/include/migraphx/convert_to_json.hpp

@@ -30,7 +30,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-std::string convert_to_json(const std::string& str);
+MIGRAPHX_EXPORT std::string convert_to_json(const std::string& str);
 
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/include/migraphx/cpp_generator.hpp

@@ -40,7 +40,7 @@ struct shape;
 
 struct cpp_generator_impl;
 
-struct cpp_generator
+struct MIGRAPHX_EXPORT cpp_generator
 {
     using generate_module_callback = std::function<std::string(
         instruction_ref, const std::unordered_map<instruction_ref, std::string>&)>;
@@ -50,7 +50,7 @@ struct cpp_generator
         std::string type;
     };
 
-    struct function
+    struct MIGRAPHX_EXPORT function
     {
         std::vector<param> params           = {};
         std::string body                    = "";

src/include/migraphx/dead_code_elimination.hpp

@@ -37,7 +37,7 @@ struct program;
 /**
  * Remove instructions where the output is not used.
  */
-struct dead_code_elimination
+struct MIGRAPHX_EXPORT dead_code_elimination
 {
     std::string name() const { return "dead_code_elimination"; }
     void apply(module& m) const;

src/include/migraphx/dom_info.hpp

@@ -34,15 +34,15 @@ inline namespace MIGRAPHX_INLINE_NS {
 
 struct module;
 
-struct dominator_info
+struct MIGRAPHX_EXPORT dominator_info
 {
     bool strictly_dominate(instruction_ref ins1, instruction_ref ins2);
 
     std::unordered_map<instruction_ref, instruction_ref> ins2idom;
 };
 
-dominator_info compute_dominator(module& m);
-// dominator_info compute_dominator_naive(const module& m);
+MIGRAPHX_EXPORT dominator_info compute_dominator(module& m);
+// MIGRAPHX_EXPORT dominator_info compute_dominator_naive(const module& m);
 
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx