enable compilation on Windows

Signed-off-by: Artur Wojcik <artur.wojcik@amd.com>

CMakeLists.txt

@@ -53,6 +53,9 @@ include(CTest)
 find_package(ROCM REQUIRED)
 find_package(Threads REQUIRED)
 
+# By default build shared libraries
+option(BUILD_SHARED_LIBS "Create shared libraries" ON)
+
 find_path(HALF_INCLUDE_DIR half.hpp PATH_SUFFIXES half)
 if (NOT HALF_INCLUDE_DIR)
     message(FATAL_ERROR "Could not find half.hpp - Please check that the install path of half.hpp has been added to CMAKE_PREFIX_PATH")

extern/CMakeLists.txt

+#####################################################################################
+# 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.
+#####################################################################################
+
+# Windows build requires CMake version 3.24 at minimum, due to SYSTEM argument to FetchContent
+cmake_minimum_required(VERSION 3.24.0 FATAL_ERROR)
+
+# https://cmake.org/cmake/help/latest/policy/CMP0135.html
+cmake_policy(SET CMP0135 NEW)
+
+include(FetchContent)
+
+set(CMAKE_CXX_STANDARD 17 CACHE INTERNAL "")
+set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE INTERNAL "")
+set(CMAKE_CXX_EXTENSIONS OFF CACHE INTERNAL "")
+
+FetchContent_Declare(
+        HALF
+        URL https://downloads.sourceforge.net/project/half/half/2.2.0/half-2.2.0.zip?ts=gAAAAABjwYR1XMSTpEV_SFhJCBhkdlggkBl9O2GQawgvJmGwqYTAsgEacimyfdBymL6etwelv_kYY7BdlCpy4mgcqceBbymbeQ%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fhalf%2Ffiles%2Flatest%2Fdownload
+        URL_MD5 b169bcfda2c65e90f73167e06368a27a
+        SYSTEM)
+
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+FetchContent_Declare(
+        nlohmann_json
+        GIT_REPOSITORY https://github.com/nlohmann/json.git
+        GIT_TAG v3.11.2
+        SYSTEM)
+
+set(protobuf_BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
+set(protobuf_MSVC_STATIC_RUNTIME OFF CACHE INTERNAL "")
+set(ABSL_BUILD_TESTING OFF CACHE INTERNAL "")
+set(ABSL_USE_SYSTEM_INCLUDES ON CACHE INTERNAL "")
+set(ABSL_PROPAGATE_CXX_STD ON CACHE INTERNAL "")
+set(ABSL_ENABLE_INSTALL OFF CACHE INTERNAL "")
+set(protobuf_BUILD_LIBPROTOC ON CACHE INTERNAL "")
+set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")
+set(protobuf_BUILD_PROTOC_BINARIES ON CACHE INTERNAL "")
+set(protobuf_BUILD_PROTOBUF_BINARIES ON CACHE INTERNAL "")
+set(protobuf_INSTALL OFF CACHE INTERNAL "")
+
+FetchContent_Declare(
+        protobuf
+        GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
+        GIT_TAG v22.2
+        SYSTEM)
+
+set(MSGPACK_USE_BOOST OFF CACHE INTERNAL "")
+set(MSGPACK_CXX17 ON CACHE INTERNAL "")
+set(MSGPACK_BUILD_TESTS OFF CACHE INTERNAL "")
+set(MSGPACK_BUILD_DOCS OFF CACHE INTERNAL "")
+
+FetchContent_Declare(
+        msgpack
+        GIT_REPOSITORY https://github.com/msgpack/msgpack-c.git
+        GIT_TAG cpp-5.0.0
+        SYSTEM)
+
+# Workaround: we only need Blaze header file, the part below helps to pass CMake configuration.
+set(BLAS_LIBRARIES rocBLAS CACHE INTERNAL "")
+set(LAPACK_LIBRARIES rocLAPACK CACHE INTERNAL "")
+
+FetchContent_Declare(
+        blaze
+        GIT_REPOSITORY https://bitbucket.org/blaze-lib/blaze.git
+        GIT_TAG v3.8.2
+        SYSTEM)
+
+# Store the current value of BUILD_SHARED_LIBS
+set(__build_shared_libs ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
+
+FetchContent_MakeAvailable(HALF nlohmann_json protobuf msgpack blaze)
+
+# Restore the old value of BUILD_SHARED_LIBS
+set(BUILD_SHARED_LIBS ${__build_shared_libs} CACHE BOOL "" FORCE)
+
+if(MIGRAPHX_ENABLE_CPU)
+    if(MIGRAPHX_ENABLE_ZENDNN)
+        set(ZENDNN_BUILD_TESTS OFF CACHE INTERNAL "")
+        set(ZENDNN_USE_LOCAL_BLIS OFF CACHE INTERNAL "")
+        set(ZENDNN_USE_LOCAL_LIBM OFF CACHE INTERNAL "")
+        FetchContent_Declare(
+                zendnn
+                GIT_REPOSITORY https://github.com/amd/ZenDNN.git
+                GIT_TAG v4.0
+                SYSTEM)
+        set(AOCL_BLIS_FAMILY amdzen CACHE INTERNAL "")
+        set(ENABLE_BLAS ON CACHE INTERNAL "")
+        set(ENABLE_MULTITHREADING ON CACHE INTERNAL "")
+        FetchContent_Declare(
+                blis
+                GIT_REPOSITORY https://github.com/apwojcik/aocl-blis.git
+                GIT_TAG aocl_4.0
+                SYSTEM)
+
+        FetchContent_MakeAvailable(zendnn blis)
+
+        FetchContent_GetProperties(blis)
+        set(__blis_include_directories
+            ${blis_BINARY_DIR}
+            ${blis_SOURCE_DIR}/aocl_dtl
+            ${blis_SOURCE_DIR}/frame/0
+            ${blis_SOURCE_DIR}/frame/0/copysc
+            ${blis_SOURCE_DIR}/frame/1
+            ${blis_SOURCE_DIR}/frame/1d
+            ${blis_SOURCE_DIR}/frame/1m
+            ${blis_SOURCE_DIR}/frame/1m/packm
+            ${blis_SOURCE_DIR}/frame/1m/unpackm
+            ${blis_SOURCE_DIR}/frame/1f
+            ${blis_SOURCE_DIR}/frame/2
+            ${blis_SOURCE_DIR}/frame/2/gemv
+            ${blis_SOURCE_DIR}/frame/2/ger
+            ${blis_SOURCE_DIR}/frame/2/hemv
+            ${blis_SOURCE_DIR}/frame/2/her
+            ${blis_SOURCE_DIR}/frame/2/her2
+            ${blis_SOURCE_DIR}/frame/2/symv
+            ${blis_SOURCE_DIR}/frame/2/syr
+            ${blis_SOURCE_DIR}/frame/2/syr2
+            ${blis_SOURCE_DIR}/frame/2/trmv
+            ${blis_SOURCE_DIR}/frame/2/trsv
+            ${blis_SOURCE_DIR}/frame/3
+            ${blis_SOURCE_DIR}/frame/3/gemm
+            ${blis_SOURCE_DIR}/frame/3/gemmt
+            ${blis_SOURCE_DIR}/frame/3/gemm/ind
+            ${blis_SOURCE_DIR}/frame/3/hemm/
+            ${blis_SOURCE_DIR}/frame/3/herk/
+            ${blis_SOURCE_DIR}/frame/3/her2k/
+            ${blis_SOURCE_DIR}/frame/3/symm/
+            ${blis_SOURCE_DIR}/frame/3/syrk/
+            ${blis_SOURCE_DIR}/frame/3/syr2k/
+            ${blis_SOURCE_DIR}/frame/3/trmm/
+            ${blis_SOURCE_DIR}/frame/3/trmm3/
+            ${blis_SOURCE_DIR}/frame/3/trsm/
+            ${blis_SOURCE_DIR}/frame/base
+            ${blis_SOURCE_DIR}/frame/base/cast
+            ${blis_SOURCE_DIR}/frame/base/check
+            ${blis_SOURCE_DIR}/frame/base/noopt
+            ${blis_SOURCE_DIR}/frame/base/proj
+            ${blis_SOURCE_DIR}/frame/compat
+            ${blis_SOURCE_DIR}/frame/compat/attic
+            ${blis_SOURCE_DIR}/frame/compat/cblas
+            ${blis_SOURCE_DIR}/frame/compat/cblas/f77_sub
+            ${blis_SOURCE_DIR}/frame/compat/check
+            ${blis_SOURCE_DIR}/frame/compat/f2c
+            ${blis_SOURCE_DIR}/frame/compat/f2c/util
+            ${blis_SOURCE_DIR}/frame/include
+            ${blis_SOURCE_DIR}/frame/include/level0
+            ${blis_SOURCE_DIR}/frame/include/level0/1e
+            ${blis_SOURCE_DIR}/frame/include/level0/1m
+            ${blis_SOURCE_DIR}/frame/include/level0/1r
+            ${blis_SOURCE_DIR}/frame/include/level0/bb
+            ${blis_SOURCE_DIR}/frame/include/level0/io
+            ${blis_SOURCE_DIR}/frame/include/level0/ri
+            ${blis_SOURCE_DIR}/frame/include/level0/ri3
+            ${blis_SOURCE_DIR}/frame/include/level0/rih
+            ${blis_SOURCE_DIR}/frame/include/level0/ro
+            ${blis_SOURCE_DIR}/frame/include/level0/rpi
+            ${blis_SOURCE_DIR}/frame/ind
+            ${blis_SOURCE_DIR}/frame/ind/cntx
+            ${blis_SOURCE_DIR}/frame/ind/oapi
+            ${blis_SOURCE_DIR}/frame/ind/tapi
+            ${blis_SOURCE_DIR}/frame/util
+            ${blis_SOURCE_DIR}/frame/thread)
+
+        set(__zendnn_compile_options
+                -fdelayed-template-parsing
+                -fms-extensions
+                -fms-compatibility)
+
+        target_compile_options(amdZenDNN
+            PRIVATE
+                ${__zendnn_compile_options})
+
+        target_compile_options(amdZenDNN_common
+            PRIVATE
+                ${__zendnn_compile_options})
+        target_compile_definitions(amdZenDNN_common PRIVATE -D_AMD64_)
+        target_include_directories(amdZenDNN_common
+            SYSTEM PRIVATE
+                ${__blis_include_directories})
+
+        target_compile_options(amdZenDNN_cpu
+            PRIVATE
+                ${__zendnn_compile_options})
+        target_include_directories(amdZenDNN_cpu
+            SYSTEM PRIVATE
+                ${__blis_include_directories})
+
+        target_compile_options(amdZenDNN_cpu_x64
+            PRIVATE
+                ${__zendnn_compile_options})
+        target_compile_definitions(amdZenDNN_cpu_x64 PRIVATE -D_AMD64_)
+        target_include_directories(amdZenDNN_cpu_x64
+            SYSTEM PRIVATE
+                ${__blis_include_directories})
+
+        unset(__zendnn_compile_options)
+
+    else()
+        set(DNNL_BUILD_TESTS OFF CACHE INTERNAL "")
+
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            # oneDNN version 1.7 workaround on clang++ error: no such file or directory: '/Od'
+            set(MINGW ON CACHE INTERNAL "")
+        endif()
+        FetchContent_Declare(
+                dnnl
+                GIT_REPOSITORY https://github.com/oneapi-src/oneDNN.git
+                GIT_TAG v1.7
+                SYSTEM)
+
+        FetchContent_MakeAvailable(dnnl)
+
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            unset(MINGW)
+        endif()
+        set(__dnnl_compile_options
+                -fdelayed-template-parsing
+                -fms-extensions
+                -fms-compatibility
+                -Wno-unused-but-set-variable
+                -Wno-unused-variable)
+        target_compile_options(dnnl
+            PRIVATE
+                ${__dnnl_compile_options})
+        target_compile_options(dnnl_common
+            PRIVATE
+                ${__dnnl_compile_options})
+        target_compile_options(dnnl_cpu
+            PRIVATE
+                ${__dnnl_compile_options})
+        target_compile_options(dnnl_cpu_x64
+            PRIVATE
+                ${__dnnl_compile_options})
+        unset(__dnnl_compile_options)
+
+        # For compatibility with find_package()
+        add_library(DNNL::dnnl INTERFACE IMPORTED GLOBAL)
+        target_link_libraries(DNNL::dnnl INTERFACE dnnl)
+
+        add_library(DNNL::dnnl_common INTERFACE IMPORTED GLOBAL)
+        target_link_libraries(DNNL::dnnl_common INTERFACE dnnl_common)
+
+        add_library(DNNL::dnnl_cpu INTERFACE IMPORTED GLOBAL)
+        target_link_libraries(DNNL::dnnl_cpu INTERFACE dnnl_cpu)
+
+        add_library(DNNL::dnnl_cpu_x64 INTERFACE IMPORTED GLOBAL)
+        target_link_libraries(DNNL::dnnl_cpu_x64 INTERFACE dnnl_cpu_x64)
+    endif()
+endif()
+
+set(__protobuf_compile_options
+        -Wno-undef
+        -Wno-deprecated-declarations)
+
+target_compile_options(libprotobuf
+    PRIVATE
+        ${__protobuf_compile_options})
+target_compile_options(libprotobuf-lite
+    PRIVATE
+        ${__protobuf_compile_options})
+target_compile_options(libprotoc
+    PRIVATE
+        ${__protobuf_compile_options})
+
+set(HALF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/_deps/half-src/include PARENT_SCOPE)
+set(BLAZE_INCLUDE ${CMAKE_BINARY_DIR}/_deps/blaze-src PARENT_SCOPE)
+set(protobuf_PROTOC_EXE ${protobuf_BINARY_DIR}/protoc.exe PARENT_SCOPE)
+
+set(protobuf_DIR ${protobuf_SOURCE_DIR}/cmake PARENT_SCOPE)
+
+if(NOT NMAKE_DIR)
+    set(NMAKE_DIR "$ENV{NMAKE_DIR}")
+endif()
+
+find_program(NMAKE_EXECUTABLE NAMES nmake.exe REQUIRED HINTS "${NMAKE_DIR}")
+
+include(ExternalProject)
+
+ExternalProject_Add(
+        sqlite3
+        GIT_REPOSITORY https://github.com/sqlite/sqlite.git
+        GIT_TAG version-3.40.0
+        GIT_SHALLOW true
+        UPDATE_DISCONNECTED true
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ${NMAKE_EXECUTABLE} /f ..\\sqlite3\\Makefile.msc USE_AMALGAMATION=1 NO_TCL=1 TOP=..\\sqlite3 libsqlite3.lib
+        INSTALL_COMMAND "")
+
+ExternalProject_Get_Property(sqlite3 BINARY_DIR)
+
+# For compatibility with PkgConfig on Linux
+add_library(PkgConfig::SQLITE3 INTERFACE IMPORTED GLOBAL)
+add_dependencies(PkgConfig::SQLITE3 sqlite3)
+target_link_directories(PkgConfig::SQLITE3 INTERFACE ${BINARY_DIR})
+target_link_libraries(PkgConfig::SQLITE3 INTERFACE libsqlite3.lib)
+target_include_directories(PkgConfig::SQLITE3 INTERFACE ${BINARY_DIR})

src/api/api.cpp

@@ -38,6 +38,7 @@
 #include <migraphx/register_op.hpp>
 #include <migraphx/json.hpp>
 #include <migraphx/convert_to_json.hpp>
+#include <array>
 #include <algorithm>
 #include <cstdarg>
 

src/api/include/migraphx/migraphx.h

@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 #include <migraphx/api/export.h>
 

src/driver/CMakeLists.txt

@@ -43,6 +43,7 @@ if(NOT WIN32)
     )
     set_directory_properties(PROPERTIES ADDITIONAL_CLEAN_FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/driver)
 endif()
+target_compile_options(driver PRIVATE -Wno-ignored-attributes -Wno-unused-parameter)
 rocm_clang_tidy_check(driver)
 
 target_link_libraries(driver migraphx_all_targets migraphx_onnx migraphx_tf migraphx_py)

src/driver/main.cpp

@@ -39,6 +39,7 @@
 #include <migraphx/json.hpp>
 #include <migraphx/version.h>
 
+#include <migraphx/instruction.hpp>
 #include <migraphx/dead_code_elimination.hpp>
 #include <migraphx/eliminate_identity.hpp>
 #include <migraphx/eliminate_pad.hpp>

src/dynamic_loader_win32.cpp

+/*
+ * 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.
+ */
+#include <migraphx/dynamic_loader.hpp>
+#include <migraphx/errors.hpp>
+#include <migraphx/file_buffer.hpp>
+#include <migraphx/tmp_dir.hpp>
+#include <utility>
+
+// cppcheck-suppress definePrefix
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+
+struct dynamic_loader_impl
+{
+    dynamic_loader_impl() = default;
+    dynamic_loader_impl(const fs::path& p, std::shared_ptr<tmp_dir> t = nullptr)
+        : handle(LoadLibrary(p.string().c_str())), temp(std::move(t))
+    {
+        if(handle == nullptr)
+        {
+            MIGRAPHX_THROW("Error loading DLL: " + p.string() + " (" +
+                           std::to_string(GetLastError()) + ")");
+        }
+    }
+
+    ~dynamic_loader_impl()
+    {
+        if(handle != nullptr)
+        {
+            FreeLibrary(handle);
+        }
+    }
+    static std::shared_ptr<dynamic_loader_impl> from_buffer(const char* image, std::size_t size)
+    {
+        auto t = std::make_shared<tmp_dir>("migx-dynload");
+        auto f = t->path / "tmp.dll";
+        write_buffer(f.string(), image, size);
+        return std::make_shared<dynamic_loader_impl>(f, t);
+    }
+
+    HMODULE handle                = nullptr;
+    std::shared_ptr<tmp_dir> temp = nullptr;
+};
+
+dynamic_loader::dynamic_loader(const fs::path& p) : impl(std::make_shared<dynamic_loader_impl>(p))
+{
+}
+
+dynamic_loader::dynamic_loader(const char* image, std::size_t size)
+    : impl(dynamic_loader_impl::from_buffer(image, size))
+{
+}
+
+dynamic_loader::dynamic_loader(const std::vector<char>& buffer)
+    : impl(dynamic_loader_impl::from_buffer(buffer.data(), buffer.size()))
+{
+}
+
+std::shared_ptr<void> dynamic_loader::get_symbol(const std::string& name) const
+{
+    FARPROC addr = GetProcAddress(impl->handle, name.c_str());
+    if(addr == nullptr)
+        MIGRAPHX_THROW("Symbol not found: " + name + " (" + std::to_string(GetLastError()) + ")");
+    return {impl, reinterpret_cast<void*>(addr)};
+}
+
+} // namespace MIGRAPHX_INLINE_NS
+} // namespace migraphx

src/include/migraphx/auto_register.hpp

@@ -63,9 +63,8 @@ const int auto_register<Action, T>::static_register = auto_register_action<Actio
 #define MIGRAPHX_AUTO_REGISTER_NAME(x) MIGRAPHX_AUTO_REGISTER_NAME_DETAIL(x)
 // NOLINTNEXTLINE
 #define MIGRAPHX_AUTO_REGISTER(...)                              \
-    void MIGRAPHX_AUTO_REGISTER_NAME(__LINE__)(migraphx::auto_register<__VA_ARGS__> x =    \
-                                                   migraphx::auto_register<__VA_ARGS__>{}) \
-        __attribute__((unused));
+    [[maybe_unused]] void MIGRAPHX_AUTO_REGISTER_NAME(__LINE__)( \
+        migraphx::auto_register<__VA_ARGS__> x = migraphx::auto_register<__VA_ARGS__>{});
 
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/include/migraphx/config.hpp

@@ -26,6 +26,10 @@
 
 #include <migraphx/export.h>
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#include <ciso646>
+#endif
+
 #if !defined(MIGRAPHX_USE_CLANG_TIDY) && !defined(DOXYGEN)
 
 #ifdef BUILD_DEV

src/include/migraphx/dynamic_loader.hpp

@@ -38,12 +38,14 @@ struct dynamic_loader_impl;
 
 struct MIGRAPHX_EXPORT dynamic_loader
 {
+#ifndef _WIN32
     template <class T>
     static fs::path path(T* address)
     {
         return path(reinterpret_cast<void*>(address));
     }
     static fs::path path(void* address);
+#endif
 
     static optional<dynamic_loader> try_load(const fs::path& p);
 

src/include/migraphx/filesystem.hpp

@@ -29,6 +29,17 @@
 #if defined(CPPCHECK)
 #define MIGRAPHX_HAS_FILESYSTEM 1
 #define MIGRAPHX_HAS_FILESYSTEM_TS 1
+#elif defined(_WIN32)
+#if _MSC_VER >= 1920
+#define MIGRAPHX_HAS_FILESYSTEM 1
+#define MIGRAPHX_HAS_FILESYSTEM_TS 0
+#elif _MSC_VER >= 1900
+#define MIGRAPHX_HAS_FILESYSTEM 0
+#define MIGRAPHX_HAS_FILESYSTEM_TS 1
+#else
+#define MIGRAPHX_HAS_FILESYSTEM 0
+#define MIGRAPHX_HAS_FILESYSTEM_TS 0
+#endif
 #elif defined(__has_include)
 #if __has_include(<filesystem>) && __cplusplus >= 201703L
 #define MIGRAPHX_HAS_FILESYSTEM 1

src/include/migraphx/float_equal.hpp

@@ -27,9 +27,6 @@
 #include <algorithm>
 #include <cmath>
 #include <numeric>
-#ifdef _MSC_VER
-#include <iso646.h>
-#endif
 
 #include <migraphx/requires.hpp>
 #include <migraphx/config.hpp>

src/include/migraphx/half.hpp

@@ -25,7 +25,11 @@
 #ifndef MIGRAPHX_GUARD_RTGLIB_HALF_HPP
 #define MIGRAPHX_GUARD_RTGLIB_HALF_HPP
 
+#if !defined(_WIN32)
 #include <half/half.hpp>
+#else
+#include <half.hpp>
+#endif
 #include <migraphx/config.hpp>
 
 namespace migraphx {

src/include/migraphx/matcher.hpp

@@ -33,6 +33,7 @@
 #include <migraphx/type_name.hpp>
 #include <migraphx/source_location.hpp>
 #include <migraphx/config.hpp>
+#include <array>
 #include <unordered_map>
 #include <unordered_set>
 

src/include/migraphx/op/nonmaxsuppression.hpp

@@ -24,6 +24,7 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_NONMAXSUPPRESSION_HPP
 #define MIGRAPHX_GUARD_OPERATORS_NONMAXSUPPRESSION_HPP
 
+#include <array>
 #include <cmath>
 #include <queue>
 #include <cstdint>

src/include/migraphx/op/roialign.hpp

@@ -33,6 +33,7 @@
 #include <migraphx/dfor.hpp>
 #include <migraphx/ranges.hpp>
 #include <migraphx/shape_for_each.hpp>
+#include <array>
 #include <cmath>
 #include <numeric>
 #include <utility>

src/include/migraphx/optional.hpp

@@ -29,6 +29,17 @@
 #if defined(CPPCHECK)
 #define MIGRAPHX_HAS_OPTIONAL 1
 #define MIGRAPHX_HAS_OPTIONAL_TS 1
+#elif defined(_WIN32)
+#if _MSC_VER >= 1920
+#define MIGRAPHX_HAS_OPTIONAL 1
+#define MIGRAPHX_HAS_OPTIONAL_TS 0
+#elif _MSC_VER >= 1900
+#define MIGRAPHX_HAS_OPTIONAL 0
+#define MIGRAPHX_HAS_OPTIONAL_TS 1
+#else
+#define MIGRAPHX_HAS_OPTIONAL 0
+#define MIGRAPHX_HAS_OPTIONAL_TS 0
+#endif
 #elif defined(__has_include)
 #if __has_include(<optional>) && __cplusplus >= 201703L
 #define MIGRAPHX_HAS_OPTIONAL 1

src/include/migraphx/run_loop.hpp

@@ -31,6 +31,7 @@
 #include <migraphx/module.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/ranges.hpp>
+#include <array>
 #include <string>
 
 namespace migraphx {

src/register_target.cpp

@@ -56,7 +56,11 @@ target make_target(const std::string& name)
 {
     if(not contains(target_map(), name))
     {
+#ifdef _WIN32
+        std::string target_name = "migraphx_" + name + ".dll";
+#else
         std::string target_name = "libmigraphx_" + name + ".so";
+#endif
         store_target_lib(dynamic_loader(target_name));
     }
     const auto it = target_map().find(name);

src/targets/cpu/include/migraphx/cpu/pointwise.hpp

@@ -24,6 +24,7 @@
 #ifndef MIGRAPHX_GUARD_AMDMIGRAPHX_CPU_POINTWISE_HPP
 #define MIGRAPHX_GUARD_AMDMIGRAPHX_CPU_POINTWISE_HPP
 
+#include <array>
 #include <migraphx/config.hpp>
 #include <migraphx/context.hpp>
 #include <migraphx/check_shapes.hpp>