diff --git a/.gitignore b/.gitignore index 1b39eed069..ffc03376d2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ syntax: glob debug/* release/* profile/* +src/turi_common.h dist/turicreateapi* configure.deps config.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 916061719b..ceedf966b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ cmake_policy(SET CMP0005 NEW) cmake_policy(SET CMP0045 OLD) cmake_policy(SET CMP0046 OLD) cmake_policy(SET CMP0042 NEW) + # Generate a compilation database for use with automated tools like IDE/editor # plugins. See http://clang.llvm.org/docs/JSONCompilationDatabase.html @@ -41,12 +42,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake") # Configure the compiler include(SetupCompiler) -setupcompiler() - -if(WIN32) - add_definitions(-DWINVER=0x0600) - add_definitions(-D_WIN32_WINNT=0x0600) -endif() +SetupCompiler() +include(CompilerFlags) if(${TC_BUILD_IOS}) add_definitions(-DTC_BUILD_IOS) @@ -58,7 +55,7 @@ if(${TC_BUILD_IOS}) endif() if(NOT ${TC_BUILD_REMOTEFS}) - add_definitions(-DTC_DISABLE_REMOTEFS) + add_compiler_source_define(TC_DISABLE_REMOTEFS) endif() # Determine where additional Turi specific cmake modules are defined @@ -97,23 +94,21 @@ endif() add_definitions(-DTC_BUILD_PATH_BASE="${CMAKE_SOURCE_DIR}") add_definitions(-DCURL_STATICLIB) add_definitions(-DIN_TURI_SOURCE_TREE) -add_definitions(-DFUSION_MAX_VECTOR_SIZE=20) -add_definitions(-DBOOST_SPIRIT_THREAD_SAFE) -add_definitions(-DBOOST_THREAD_ONCE_ATOMIC) - -# These determine the maximum number of arguments for extension functions -add_definitions(-DBOOST_FUSION_INVOKE_MAX_ARITY=12) -add_definitions(-DBOOST_FUSION_INVOKE_PROCEDURE_MAX_ARITY=12) -add_definitions(-DBOOST_FUSION_INVOKE_FUNCTION_OBJECT_MAX_ARITY=12) -# Workaround for https://svn.boost.org/trac10/ticket/10443 in Boost 1.68.0 -add_definitions(-DBOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK) +# Compile specif defines for boost. +add_compiler_source_define(FUSION_MAX_VECTOR_SIZE=20) +add_compiler_source_define(BOOST_SPIRIT_THREAD_SAFE) +add_compiler_source_define(BOOST_THREAD_ONCE_ATOMIC) +add_compiler_source_define(BOOST_FUSION_INVOKE_MAX_ARITY=12) +add_compiler_source_define(BOOST_FUSION_INVOKE_PROCEDURE_MAX_ARITY=12) +add_compiler_source_define(BOOST_FUSION_INVOKE_FUNCTION_OBJECT_MAX_ARITY=12) +add_compiler_source_define(BOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK) # Legal define for Eigen. -add_definitions(-DEIGEN_MPL2_ONLY) +add_compiler_source_define(EIGEN_MPL2_ONLY) # Defines to avoid symbol collisions -add_definitions(-Dgoogle=_tc_google) +add_compiler_source_define(google=_tc_google) # **************************************************************************/ # * */ @@ -148,7 +143,8 @@ check_and_set_compiler_flag(-Wno-unknown-pragmas) check_and_set_compiler_flag(-Wno-unused-local-typedefs) check_and_set_compiler_flag(-Wno-attributes) check_and_set_compiler_flag(-Wno-tautological-compare) - +check_and_set_compiler_flag(-Wno-nullability-completeness) +check_and_set_compiler_flag(-Wno-shadow-ivar) check_and_set_compiler_flag(-fpeel-loops RELEASE) check_and_set_compiler_flag(-funswitch-loops RELEASE) check_and_set_compiler_flag(-ftracer RELEASE) @@ -198,8 +194,15 @@ endif() include(FindInt128) find_int128_types() -# Set up defines around a few compiler and language oddities that we have to -# understand. +set(_compiler_int128_defs ${INT128_FLAGS}) +separate_arguments(_compiler_int128_defs) +list(FILTER _compiler_int128_defs INCLUDE REGEX "^-D.*") +foreach(_def ${_compiler_int128_defs}) + string(REGEX REPLACE "^-D(.*)$" "\\1" _set_arg ${_def}) + add_compiler_source_define(${_set_arg}) +endforeach() + +# Set up defines around a few compiler and language oddities that we have to understand. include(CompilerOddities) set_compiler_specific_flags() @@ -209,6 +212,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) if(CMAKE_USE_PTHREADS_INIT) add_definitions(-DHAVE_PTHREAD) + add_compiler_source_define(HAVE_PTHREAD) endif() # Get framework dependencies. @@ -231,6 +235,7 @@ if(APPLE) ${CORE_IMAGE} ${CORE_ML} ${CORE_VIDEO} + ${MLCOMPUTE} ${METAL} ${METAL_PERFORMANCE_SHADERS}) @@ -275,13 +280,9 @@ elseif(APPLE) ) else() # LINUX - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,\\$ORIGIN") - set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath,\\$ORIGIN -Wl,-rpath,\\$ORIGIN/.." - ) - set(CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-rpath,\\$ORIGIN -Wl,-rpath,\\$ORIGIN/.." - ) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,$ORIGIN") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath,$ORIGIN -Wl,-rpath,$ORIGIN/..") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-rpath,$ORIGIN -Wl,-rpath,$ORIGIN/..") endif() # Common install locations for deps linked libraries @@ -355,192 +356,223 @@ include(MakeExecutable) include(MakeTest) include(BuildUtilities) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/deps/local/include) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/boost/boost_1_68_0/) -include_directories(SYSTEM - ${CMAKE_SOURCE_DIR}/src/external/libpng/libpng-1.6.37/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/libjpeg/jpeg-8d/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/bzip2/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/zlib/zlib-1.2.11/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/coremltools_wrap/) - link_directories(${CMAKE_SOURCE_DIR}/deps/local/lib) link_directories(${CMAKE_SOURCE_DIR}/deps/local/lib64) +include_directories(${CMAKE_SOURCE_DIR}/deps/local/include/) include_directories(src) -include_directories(src/core/system/platform) -include_directories(SYSTEM src/external) +include_directories(${CMAKE_BINARY_DIR}/src) + +set(TC_EXTERNAL_INCLUDE_SUBDIRS + ./ + boost/boost_1_68_0/ + libpng/libpng-1.6.37/ + libjpeg/jpeg-8d/ + bzip2/ + google + nanomsg/nanomsg-1.0.0/src + zlib/zlib-1.2.11/ + coremltools_wrap/) if(${TC_BUILD_REMOTEFS}) - include_directories(SYSTEM src/external/aws-sdk-cpp/aws-cpp-sdk-core/include) - include_directories(SYSTEM src/external/aws-sdk-cpp/aws-cpp-sdk-s3/include) + set(TC_EXTERNAL_INCLUDE_SUBDIRS + ${TC_EXTERNAL_INCLUDE_SUBDIRS} + aws-sdk-cpp/aws-cpp-sdk-core/include + aws-sdk-cpp/aws-cpp-sdk-s3/include) endif() -include_directories(SYSTEM src/external/google) -include_directories(SYSTEM src/external/nanomsg/nanomsg-1.0.0/src) +foreach(_dir ${TC_EXTERNAL_INCLUDE_SUBDIRS}) + include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/src/external/${_dir}) +endforeach() -# Include all the external dependencies. -include(ExternalProject) add_custom_target(external_dependencies) -file(GLOB packages "${DEPS_CMAKE}/ExternalProject*.cmake") -foreach(package ${packages}) - get_filename_component(packagename "${package}" NAME_WE) - # package is of the form ExternalProjectXXX" - include(${package}) - string(SUBSTRING "${packagename}" 15 -1 depname) - string(TOLOWER ${depname} depname) - set(package_${depname} - requires_${depname} - CACHE STRING "Package map") - add_dependencies(external_dependencies ex_${depname}) -endforeach() +if(${TC_BUILD_REMOTEFS}) + if(NOT ${TC_EXTERNAL_DEPS_PREBUILT}) + +# Include all the external dependencies. + include(ExternalProject) + + file(GLOB packages "${DEPS_CMAKE}/ExternalProject*.cmake") + foreach(package ${packages}) + get_filename_component(packagename "${package}" NAME_WE) + #package is of the form ExternalProjectXXX" + include(${package}) + STRING(SUBSTRING "${packagename}" 15 -1 depname) + string(TOLOWER ${depname} depname) + set(package_${depname} requires_${depname} CACHE STRING "Package map") + add_dependencies(external_dependencies ex_${depname}) + endforeach() + endif() + + set(TC_EXTERNAL_DEPENDENCIES openssl libxml2 curl) +endif() + +set(TC_EXTERNAL_DEPENDENCIES + ${TC_EXTERNAL_DEPENDENCIES} + Threads::Threads + ${CMAKE_DL_LIBS}) -set(_TC_EXTERNAL_DEPENDENCIES openssl libxml2 curl Threads::Threads - ${CMAKE_DL_LIBS}) # Collate all the object targets shared among static and shared library targets # These are used by C API, unity_shared, etc. -if(NOT _TC_DEFAULT_SERVER_INITIALIZER) - set(_TC_DEFAULT_SERVER_INITIALIZER - "${CMAKE_SOURCE_DIR}/src/capi/default_server_initializer.cpp") +if(NOT TC_DEFAULT_SERVER_INITIALIZER) + set(TC_DEFAULT_SERVER_INITIALIZER + "${CMAKE_SOURCE_DIR}/src/capi/default_server_initializer.cpp" + ) endif() -if(NOT TC_DISABLE_OBJECT_BUILDS) - - set(_TC_COMMON_OBJECTS - # External dependencies (built from src/external) - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - # Then our own source code - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$") - - # TODO we can remove the requirements from here when target_link_libraries - # works with OBJECT library targets (requires CMake 3.12) See - # https://gitlab.kitware.com/cmake/cmake/issues/14778 - set(_TC_COMMON_REQUIREMENTS # External dependencies (from deps) - ${_TC_EXTERNAL_DEPENDENCIES} nanomsg boost libbz2 z) - - if(APPLE) - set(_TC_COMMON_REQUIREMENTS # External dependencies (from deps) - ${_TC_COMMON_REQUIREMENTS} ${_TC_APPLE_DEPENDENCIES}) - endif() - set(_TC_COMMON_OBJECTS ${_TC_COMMON_OBJECTS} "$" - "$") - - if(APPLE) - set(_TC_COMMON_OBJECTS - ${_TC_COMMON_OBJECTS} "$" - "$") - set(_TC_COMMON_REQUIREMENTS ${_TC_COMMON_REQUIREMENTS} ${CORE_ML} - ${CORE_VIDEO} ${FOUNDATION}) - if(NOT ${TC_BUILD_IOS}) - set(_TC_COMMON_OBJECTS ${_TC_COMMON_OBJECTS} - "$") - set(_TC_COMMON_REQUIREMENTS ${_TC_COMMON_REQUIREMENTS} ${APPKIT} - ${CORE_GRAPHICS} ${JAVASCRIPT_CORE}) - if(HAS_MPS) - set(_TC_COMMON_OBJECTS ${_TC_COMMON_OBJECTS} "$") - set(_TC_COMMON_REQUIREMENTS - ${_TC_COMMON_REQUIREMENTS} ${ACCELERATE} ${CORE_IMAGE} ${METAL} - ${METAL_PERFORMANCE_SHADERS}) - endif() - if(HAS_ML_COMPUTE) - set(_TC_COMMON_OBJECTS ${_TC_COMMON_OBJECTS} "$") - set(_TC_COMMON_REQUIREMENTS - ${_TC_COMMON_REQUIREMENTS} ${ACCELERATE} ${CORE_IMAGE} ${MLCOMPUTE}) - endif() - endif() - endif() +################################################################################ +# +# Write out all the definitions into a common header file. - if(TC_BUILD_REMOTEFS) - # object targets that should be included in all APPLE and non-APPLE - # platforms except for iOS - set(_TC_COMMON_OBJECTS ${_TC_COMMON_OBJECTS}) - list(APPEND _TC_COMMON_REQUIREMENTS aws-cpp-sdk) - endif() +set(TC_COMMON_HEADER_FILE ${CMAKE_SOURCE_DIR}/src/turi_common.h) + +# Write out all the definitions into a single file +separate_arguments(TC_COMPILER_SOURCE_DEFINES) + +set(_file_contents " +// AUTOGENERATED DEFINITIONS +// DO NOT EDIT +#ifndef TC_CODE_DEFINES +#define TC_CODE_DEFINES + +") + +foreach(_def ${TC_COMPILER_SOURCE_DEFINES}) + + string(REGEX REPLACE "^([^\\=]+)(=|$)((.*)$|)" "\\1" _variable ${_def}) + string(REGEX REPLACE "^([^\\=]+)(=|$)((.*)$|)" "#define \\1 \\3" _expression ${_def}) + + set(_file_contents "${_file_contents} +#ifndef ${_variable} +${_expression} +#endif +") + +endforeach() + +set(_file_contents "${_file_contents} +#endif // End ifdef TC_CODE_DEFINES +") + +file(WRITE ${TC_COMMON_HEADER_FILE} "${_file_contents}") -endif() # End disable object builds -if(EXISTS ${CMAKE_SOURCE_DIR}/extensions) - include_directories(SYSTEM extensions) - add_subdirectory(extensions) +################################################################################ + +# Add in src/external as a subdirectory. The rest of the directories are +# handled directly below +add_subdirectory(src/external) + +set(TC_DEPENDENCIES + z libjson libjpeg libpng eigen sparsehash protobuf libbz2 + lz4 uuid xgboost coremltools_mlmodel boost nanomsg) + + +if(${TC_BUILD_REMOTEFS}) + set(TC_DEPENDENCIES ${TC_DEPENDENCIES} aws-sdk-cpp) endif() -# for build-time generated source code -include_directories(SYSTEM ${CMAKE_BINARY_DIR}/src) +############################################################################### +# Also set up the visualization. This contains a lot of custom scripts, +# so we preserve it. + +add_subdirectory(src/visualization) +set(TC_DEPENDENCIES ${TC_DEPENDENCIES} + visualization vega_renderer annotation) -if(EXISTS ${CMAKE_SOURCE_DIR}/subtree) - include_directories(SYSTEM subtree) - add_subdirectory(subtree) +################################################################################ +# Add all the framework dependencies + +if(APPLE) + macro(AddFrameworkDependency _name) + find_library(_fwrk_path_${_name} ${_name} REQUIRED) + set(TC_DEPENDENCIES ${TC_DEPENDENCIES} "-framework ${_name}") + endmacro() + + AddFrameworkDependency(Accelerate) + AddFrameworkDependency(CoreGraphics) + AddFrameworkDependency(JavaScriptCore) + AddFrameworkDependency(Foundation) + AddFrameworkDependency(CoreImage) + AddFrameworkDependency(CoreML) + AddFrameworkDependency(CoreVideo) + AddFrameworkDependency(Metal) + AddFrameworkDependency(MetalPerformanceShaders) + if(NOT ${TC_BUILD_IOS}) + AddFrameworkDependency(AppKit) + endif() endif() -add_subdirectory(src) -add_subdirectory(test) + +FILE(GLOB_RECURSE _tc_core_files + CONFIGURE_DEPENDS + ${CMAKE_SOURCE_DIR}/src/core/*.h + ${CMAKE_SOURCE_DIR}/src/core/*.c + ${CMAKE_SOURCE_DIR}/src/core/*.hpp + ${CMAKE_SOURCE_DIR}/src/core/*.cpp + ${CMAKE_SOURCE_DIR}/src/core/*.m + ${CMAKE_SOURCE_DIR}/src/core/*.mm + + ${CMAKE_SOURCE_DIR}/src/ml/*.h + ${CMAKE_SOURCE_DIR}/src/ml/*.c + ${CMAKE_SOURCE_DIR}/src/ml/*.hpp + ${CMAKE_SOURCE_DIR}/src/ml/*.cpp + ${CMAKE_SOURCE_DIR}/src/ml/*.m + ${CMAKE_SOURCE_DIR}/src/ml/*.mm + + ${CMAKE_SOURCE_DIR}/src/model_server/*.h + ${CMAKE_SOURCE_DIR}/src/model_server/*.c + ${CMAKE_SOURCE_DIR}/src/model_server/*.hpp + ${CMAKE_SOURCE_DIR}/src/model_server/*.cpp + ${CMAKE_SOURCE_DIR}/src/model_server/*.m + ${CMAKE_SOURCE_DIR}/src/model_server/*.mm + + ${CMAKE_SOURCE_DIR}/src/toolkits/*.h + ${CMAKE_SOURCE_DIR}/src/toolkits/*.c + ${CMAKE_SOURCE_DIR}/src/toolkits/*.hpp + ${CMAKE_SOURCE_DIR}/src/toolkits/*.cpp + ${CMAKE_SOURCE_DIR}/src/toolkits/*.m + ${CMAKE_SOURCE_DIR}/src/toolkits/*.mm + + + ${CMAKE_SOURCE_DIR}/src/capi/*.h + ${CMAKE_SOURCE_DIR}/src/capi/*.c + ${CMAKE_SOURCE_DIR}/src/capi/*.hpp + ${CMAKE_SOURCE_DIR}/src/capi/*.cpp + ${CMAKE_SOURCE_DIR}/src/capi/*.m + ${CMAKE_SOURCE_DIR}/src/capi/*.mm) + + +# Set up some specific source dependencies. +list(FILTER _tc_core_files EXCLUDE REGEX ".*/model_server/extensions/.*") + +add_library(TuriCore SHARED ${_tc_core_files}) +target_link_libraries(TuriCore ${TC_DEPENDENCIES} ${TC_EXTERNAL_DEPENDENCIES}) +add_dependencies(TuriCore external_dependencies ${TC_EXTERNAL_DEPENDENCIES}) +# set_property(TARGET TuriCore APPEND_STRING PROPERTY LINK_FLAGS " -undefined dynamic_lookup") +source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${_tc_core_files}) + +set(TC_TARGET_DIR "${CMAKE_SOURCE_DIR}/targets/") + +INSTALL(TARGETS TuriCore + LIBRARY DESTINATION ${TC_TARGET_DIR}/lib/) +INSTALL(DIRECTORY src/ + DESTINATION ${TC_TARGET_DIR}/include/ + MESSAGE_NEVER + FILES_MATCHING REGEX "^.*\.((h)|(hpp)|(ipp)|(sparsehash/.*))$") + +INSTALL(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + ${TC_TARGET_DIR}/include/external/boost/boost_1_68_0/boost \ + ${TC_TARGET_DIR}/include/boost)") + +INSTALL(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + ${TC_TARGET_DIR}/include/external/sparsehash/ \ + ${TC_TARGET_DIR}/include/sparsehash)") + diff --git a/build_python_wheel.sh b/build_python_wheel.sh new file mode 100755 index 0000000000..2dda03e273 --- /dev/null +++ b/build_python_wheel.sh @@ -0,0 +1,112 @@ +#!/bin/bash -e + + +function print_help { + echo "Configures and builds a specified target." + echo + echo "Usage: ./build.sh [build options] [configure options]" + echo + echo "Common Options:" + echo " --target-dir, -t The target directory to install artifact to." + echo " default: `pwd`/targets." + echo + echo " --release Build in release mode." + echo " --debug Build in debug mode (default)." + echo + echo " --jobs,-j The number of parallel jobs to run." + echo + echo " --cleanup,-c Clean up everything before building." + echo + echo " --skip-configure,-s Skip running ./configure." + echo + echo " --build-number Set build number. " + echo " Defaults to part of git commit hash. " + echo + echo " All additional options passed through to ./configure." + echo + exit 1 +} # end of print help + +function unknown_option { + echo "Unrecognized option: $1" + echo "To get help, run ./configure --help" + exit 1 +} # end of unknown option + +if [[ ${OSTYPE} == darwin* ]] ; then + apple=1 +else + apple=0 +fi + + +# command flag options +cleanup=0 +skip_configure=0 +jobs=4 +configure_options="" +build_mode="release" +target_dir=`pwd`/targets +install_sysroot="" +no_sudo=0 +copy_links=0 +build_number=`git rev-parse --short HEAD || echo "NULL"` + +############################################################################### +# +# Parse command line configure flags ------------------------------------------ +# +while [ $# -gt 0 ] + do case $1 in + + --cleanup|-c) cleanup=1;; + + --skip-configure|-s) skip_configure=1;; + + --copy-links) copy_links=1;; + + --build-number=*) build_number=${1##--build-number=} ;; + --build-number) build_number="$2"; shift;; + + --target-dir=*) target_dir="${1##--target-dir=}" ;; + --target-dir|-t) target_dir="$2"; shift ;; + + --jobs=*) jobs=${1##--jobs=} ;; + --jobs|-j) jobs=$2; shift ;; + + --help) print_help; exit 0;; + + -D) configure_options="${configure_options} -D $2"; shift ;; + + *) configure_options="${configure_options} $1";; + esac + shift +done + +build_dir=`pwd`/${build_mode} +src_dir=`pwd` + + +echo "Setting up build:" +echo "build_mode = ${build_mode}" +echo "target_dir = ${target_dir}" +echo "target = ${target}" +echo "build_dir = ${build_dir}" + + +if [[ ${cleanup} -eq 1 ]]; then + ./configure --cleanup --yes || exit 1 +fi + +if [[ ${skip_configure} -eq 0 ]] ; then + ./configure ${configure_options} --with-python || exit 1 +else + echo "skipping configure script as requested." +fi + + +install_dir=${target_dir}/python +rm -rf ${target_dir}/python +mkdir -p ${target_dir}/python + +bash scripts/make_wheel.sh --skip_test --skip_cpp_test --build_number="$build_number" --num_procs=${jobs} --${build_mode} --target-dir="${install_dir}" diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake index 3452338308..9ad97ccf35 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake @@ -2,6 +2,16 @@ include(CheckCXXCompilerFlag) include(CheckCCompilerFlag) include(CMakeParseArguments) +# Set a define to be dumped into turi_common.h at the end. +# +# A compiler source define is one that determines or switches some part of the +# compilation, but isn't related to the particular build being asked for. These are dumped into +# turi_common.h at the end. +# +macro(add_compiler_source_define FLAG) + add_definitions(-D${FLAG}) + set(TC_COMPILER_SOURCE_DEFINES "${TC_COMPILER_SOURCE_DEFINES} ${FLAG}") +endmacro() # check_and_set_compiler_flag # diff --git a/cmake/CompilerOddities.cmake b/cmake/CompilerOddities.cmake index 60bbabf058..392f8d19fc 100644 --- a/cmake/CompilerOddities.cmake +++ b/cmake/CompilerOddities.cmake @@ -1,4 +1,6 @@ include(CheckCXXSourceCompiles) +include(CompilerFlags) + macro(Set_Compiler_Specific_Flags) @@ -16,7 +18,7 @@ macro(Set_Compiler_Specific_Flags) if(COMPILER_HAS_IOS_BASE_FAILURE_WITH_ERROR_CODE) message(STATUS "Compiler supports ios_base::failure(str, error_code)") - add_definitions(-DCOMPILER_HAS_IOS_BASE_FAILURE_WITH_ERROR_CODE) + add_compiler_source_define(COMPILER_HAS_IOS_BASE_FAILURE_WITH_ERROR_CODE) else() message(STATUS "Compiler does not support ios_base::failure(str, error_code)") endif() @@ -60,11 +62,11 @@ macro(Set_Compiler_Specific_Flags) message(FATAL_ERROR "Cannot determine noexcept fladg on std::ios_base::failure. See log.") elseif(COMPILER_HAS_NOEXCEPT_WHAT_ON_EXCEPTIONS_V1) - add_definitions(-DCOMPILER_MODIFIER_ON_EXCEPTION_WHAT=noexcept) + add_compiler_source_define(COMPILER_MODIFIER_ON_EXCEPTION_WHAT=noexcept) elseif(COMPILER_HAS_NOEXCEPT_WHAT_ON_EXCEPTIONS_V2) - add_definitions(-DCOMPILER_MODIFIER_ON_EXCEPTION_WHAT=_NOEXCEPT) + add_compiler_source_define(DCOMPILER_MODIFIER_ON_EXCEPTION_WHAT=_NOEXCEPT) else() - add_definitions(-DCOMPILER_MODIFIER_ON_EXCEPTION_WHAT="") + add_compiler_source_define(COMPILER_MODIFIER_ON_EXCEPTION_WHAT=) endif() endmacro() diff --git a/configure b/configure index 9c0efe2bfe..cd4a70f8ac 100755 --- a/configure +++ b/configure @@ -81,6 +81,13 @@ function print_help { echo echo " -D var=value Specify FLAGS definitions to be passed on to cmake." echo + echo " --create-xcode-project Create an xcode project file as xcode/Turi.xcodeproj." + echo + echo " --build-dependencies Build the external dependencies as part of configure and install them into deps/local." + echo " Needed for the xcode project build." + echo + echo " --skip-dependencies Skip building the dependencies." + echo echo "Relevant environment variables: " echo echo " CMAKE Path to CMake executable." @@ -158,12 +165,14 @@ with_release=1 with_debug=1 release_opt_for_size=0 debug_opt_for_size=0 +create_xcode_project=0 arch_list="" target="" builder="make" min_ios_version=${IOS_DEFAULT_MIN_VERSION} min_macos_version=${MACOS_DEFAULT_MIN_VERSION} enable_codesign=0 +build_dependencies=0 list_source_files=0 DEBUG_DIR="${TURI_HOME}/debug" @@ -241,6 +250,11 @@ while [ $# -gt 0 ] --min-macos-version=*) min_macos_version=${1##--min-macos-version=};; --min-macos-version) min_macos_version=${2}; shift ;; + --create-xcode-project) create_xcode_project=1; build_dependencies=1; builder=xcode;; + + --build-dependencies) build_dependencies=1;; + --skip-dependencies) skip_dependencies=1;; + --list-source-files) list_source_files=1 ;; *) unknown_option $1 ;; @@ -346,6 +360,8 @@ mkdir -p ${PWD}/deps/local/bin CCCMD=`./scripts/find_compiler.sh cc --ccache=$with_ccache --script-dir=${PWD}/deps/local/bin/` CXXCMD=`./scripts/find_compiler.sh cxx --ccache=$with_ccache --script-dir=${PWD}/deps/local/bin/` +CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DCMAKE_C_COMPILER=$CCCMD -DCMAKE_CXX_COMPILER=$CXXCMD" + echo "Setting C compiler to $CCCMD." echo "Setting C++ compiler to $CXXCMD." @@ -374,16 +390,21 @@ CMAKE=`./scripts/find_cmake.sh` ######################################################## # Prepare to build + + +# Configuration flags that are specific to the xcode builder +CMAKE_XCODE_CONFIG_FLAGS="" + set -e set -o pipefail case $builder in - xcode) - CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -GXcode" - CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD_REQUIRED=1" + xcode) + CMAKE_XCODE_CONFIG_FLAGS="${CMAKE_XCODE_CONFIG_FLAGS} -GXcode" + CMAKE_XCODE_CONFIG_FLAGS="${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD_REQUIRED=1" - if [[ ! -z ${arch_list} ]] ; then - CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DCMAKE_OSX_ARCHITECTURES='${arch_list}'" + if [[ ! -z ${arch_list} ]] ; then + CMAKE_XCODE_CONFIG_FLAGS="${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_OSX_ARCHITECTURES='${arch_list}'" fi ;; @@ -402,11 +423,11 @@ if [[ ${enable_codesign} == 1 ]] ; then elif [[ ${builder} == xcode ]] ; then - # Deal with the code signing issues. - CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY= -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=0 -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM= " + # Deal with the code signing issues. + CMAKE_XCODE_CONFIG_FLAGS="${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY= -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=0 -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM= " # This also requires us to skip the code signing when trying to compile targets to check definitions. - CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + CMAKE_XCODE_CONFIG_FLAGS="${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" echo "Skipping code signing." fi @@ -454,22 +475,41 @@ if [[ ${build_platform} == macosx ]] ; then fi fi -build_cmd="$CMAKE \ - $GENERATOR \ - -D CMAKE_C_COMPILER=$CCCMD \ - -D CMAKE_CXX_COMPILER=$CXXCMD \ - ${CMAKE_CONFIG_FLAGS}" - -if [[ $with_debug == 1 ]] ; then - set -x - mkdir -p ${DEBUG_DIR} - cd ${DEBUG_DIR} && $build_cmd -DCMAKE_BUILD_TYPE=Debug --config Debug -D CMAKE_CONFIGURATION_TYPES='Debug;Release' ${TURI_HOME} - set +x +if [[ $build_dependencies == 1 ]] ; then + + # Build the dependencies through the make build scripts so they don't have to + # be part of the XCode project, which doesn't work. + + deps_build_dir=${TURI_HOME}/deps/build + mkdir -p $deps_build_dir + cd ${deps_build_dir} + $CMAKE ${CMAKE_CONFIG_FLAGS} -DCMAKE_BUILD_TYPE=Release --config Release ${TURI_HOME} + make external_dependencies + CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DTC_EXTERNAL_DEPS_PREBUILT=1" +else + CMAKE_CONFIG_FLAGS="${CMAKE_CONFIG_FLAGS} -DTC_EXTERNAL_DEPS_PREBUILT=0" fi -if [[ $with_release == 1 ]] ; then - set -x - mkdir -p ${RELEASE_DIR} - cd ${RELEASE_DIR} && $build_cmd -DCMAKE_BUILD_TYPE=Release -D CMAKE_CONFIGURATION_TYPES='Release;Debug' --config Release ${TURI_HOME} - set +x + +if [[ $create_xcode_project == 1 ]] ; then + xcode_proj_dir=${TURI_HOME}/xcode/ + mkdir -p $xcode_proj_dir + cd ${xcode_proj_dir} + $CMAKE ${CMAKE_CONFIG_FLAGS} ${CMAKE_XCODE_CONFIG_FLAGS} -DTC_EXTERNAL_DEPS_PREBUILT=1 -DCMAKE_BUILD_TYPE=Debug --config Debug -D CMAKE_CONFIGURATION_TYPES='Debug;Release' ${TURI_HOME} + +else + if [[ $with_debug == 1 ]] ; then + set -x + mkdir -p ${DEBUG_DIR} + cd ${DEBUG_DIR} && $CMAKE ${CMAKE_CONFIG_FLAGS} ${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_BUILD_TYPE=Debug --config Debug -D CMAKE_CONFIGURATION_TYPES='Debug;Release' ${TURI_HOME} + set +x + fi + + if [[ $with_release == 1 ]] ; then + set -x + mkdir -p ${RELEASE_DIR} + cd ${RELEASE_DIR} && $CMAKE ${CMAKE_CONFIG_FLAGS} ${CMAKE_XCODE_CONFIG_FLAGS} -DCMAKE_BUILD_TYPE=Release -D CMAKE_CONFIGURATION_TYPES='Release;Debug' --config Release ${TURI_HOME} + set +x + fi fi + diff --git a/scripts/make_wheel.sh b/scripts/make_wheel.sh index b6d4ea341e..126cdd0d3a 100755 --- a/scripts/make_wheel.sh +++ b/scripts/make_wheel.sh @@ -163,7 +163,7 @@ fi push_ld_library_path() { OLD_LIBRARY_PATH=$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=${WORKSPACE}/deps/local/lib:${WORKSPACE}/deps/local/lib64:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${WORKSPACE}/targets/lib;$LD_LIBRARY_PATH } pop_ld_library_path() { @@ -183,7 +183,7 @@ build_source() { # make src/ cd ${WORKSPACE}/${build_type}/src - make -j${NUM_PROCS} + make -j${NUM_PROCS} install # make test/ if [[ -z $SKIP_TEST ]]; then @@ -194,6 +194,7 @@ build_source() { make -j${NUM_PROCS} fi fi + pop_ld_library_path echo -e "\n\n================= Done Build Source ================\n\n" @@ -219,50 +220,22 @@ unit_test() { echo -e "\n\n================= Done Python Unit Tests ================\n\n" } -mac_patch_rpath() { - echo -e "\n\n\n================= Patching Mac RPath ================\n\n\n" - # on mac we need to do a little work to fix up RPaths - cd ${WORKSPACE}/${build_type}/src/python - # - look for all files - # - run 'file' on it - # - look for binary files (shared libraries, executables) - # - output is in the form [file]: type, so cut on ":", we just want the file - flist=`find . -type f -not -path "*/CMakeFiles/*" -not -path "./dist/*" | xargs -L 1 file | grep x86_64 | cut -f 1 -d :` - - # We are generally going to be installed in - # a place of the form - # PREFIX/lib/python2.7/site-packages/[module] - # libpython2.7 will probably in PREFIX/lib - # So for instance if I am in - # PREFIX/lib/python2.7/site-packages/turicreate/unity_server - # I need to add - # ../../../ to the rpath (to make it to lib/) - # But if I am in - # - # PREFIX/lib/python2.7/site-packages/turicreate/something/somewhere - # I need to add - # ../../../../ to the rpath - for f in $flist; do - # Lets explain the regexes - # - The first regex removes "./" - # - The second regex replaces the string "[something]/" with "../" - # (making sure something does not contain '/' characters) - # - The 3rd regex removes the last "filename" bit - # - # Example: - # Input: ./turicreate/cython/cy_ipc.so - # After 1st regex: turicreate/cython/cy_ipc.so - # After 2nd regex: ../../cy_ipc.so - # After 3rd regex: ../../ - relative=`echo $f | sed 's:\./::g' | sed 's:[^/]*/:../:g' | sed 's:[^/]*$::'` - # Now we need ../../ to get to PREFIX/lib - rpath="@loader_path/../../$relative" - install_name_tool -add_rpath $rpath $f || true - done -} ### Package the release folder into a wheel, and strip the binaries ### +<<<<<<< HEAD +package_wheel() { + cd ${WORKSPACE}/src/python + + echo -e "\n\n\n================= Building Wheel ================\n\n\n" + cd ${WORKSPACE}/${build_type}/src/python + + VERSION_NUMBER=`${PYTHON_EXECUTABLE} -c "import setup; print(setup.VERSION)"` + wheel_name=`${PYTHON_EXECUTABLE} setup.py -q bdist_wheel_name` + old_platform_tag=`${PYTHON_EXECUTABLE} -c "import distutils; print(distutils.util.get_platform())"` + LD_LIBRARY_PATH='${WORKSPACE}/targets/lib' CPATH='${WORKSPACE}/targets/include' ${PYTHON_EXECUTABLE} setup.py bdist_wheel + +======= function package_wheel() { if [[ $OSTYPE == darwin* ]]; then mac_patch_rpath @@ -301,6 +274,7 @@ function package_wheel() { local dist_type="bdist_wheel" cd ${WORKSPACE}/${build_type}/src/python +>>>>>>> master if [[ "$is_minimal" -eq 1 ]] ; then local pkg_patch_ver=$(grep VERSION_STRING setup.py | cut -d " " -f3) @@ -314,54 +288,29 @@ function package_wheel() { fi fi - # This produced a wheel starting with turicreate-${VERSION_NUMBER} under dist/ - if [[ "${is_minimal}" -eq 1 ]]; then - "${PYTHON_EXECUTABLE}" setup.py -q "${dist_type}" install --minimal - # restore the scene after packing; making it reentrant - cp ${WORKSPACE}/src/python/setup.py setup.py - cp ${WORKSPACE}/src/python/turicreate/version_info.py turicreate/version.py - else - # full version - "${PYTHON_EXECUTABLE}" setup.py -q "${dist_type}" - fi + WHEEL_PATH=`ls ${WORKSPACE}/src/python/dist/${wheel_name}.whl` - VERSION_NUMBER=`${PYTHON_EXECUTABLE} -c "from turicreate.version_info import version; print(version)"` + if [[ $OSTYPE == darwin* ]]; then - cd "${WORKSPACE}" + DYLD_LIBRARY_PATH="${WORKSPACE}/targets/lib" delocate-wheel -v ${WHEEL_PATH} - WHEEL_PATH=$(ls "${WORKSPACE}/${build_type}/src/python/dist/turicreate-${VERSION_NUMBER}"*.whl) + platform_tag="macosx_10_12_intel.macosx_10_12_x86_64.macosx_10_13_intel.macosx_10_13_x86_64.macosx_10_14_intel.macosx_10_14_x86_64" - if [[ $OSTYPE == darwin* ]]; then - # Change the platform tag embedded in the file name - temp=`echo $WHEEL_PATH | perl -ne 'print m/(^.*-).*$/'` - temp=${temp/-cpdarwin-/-cp35m-} + NEW_WHEEL_PATH=${WORKSPACE}/targets/${wheel_name/$old_platform_tag/$platform_tag}.whl - platform_tag="macosx_10_12_intel.macosx_10_12_x86_64.macosx_10_13_intel.macosx_10_13_x86_64.macosx_10_14_intel.macosx_10_14_x86_64" - # sdk_version=`xcrun --show-sdk-version` - # if [[ $sdk_version =~ ^10\.13 ]]; then - # platform_tag="macosx_10_13_intel.macosx_10_12_x86_64" - # elif [[ $sdk_version =~ ^10\.12 ]]; then - # platform_tag="macosx_10_12_intel.macosx_10_12_x86_64" - # fi + else + LD_LIBRARY_PATH="${WORKSPACE}/targets/lib" auditwheel repair ${WHEEL_PATH} - NEW_WHEEL_PATH=${temp}${platform_tag}".whl" - mv ${WHEEL_PATH} ${NEW_WHEEL_PATH} - WHEEL_PATH=${NEW_WHEEL_PATH} - else - # Don't pick up -manylinux1 wheels, since those may have been created by a later step from a previous build. - # Ignore those for now by selecting only -linux wheels. - WHEEL_PATH=`ls ${WORKSPACE}/${build_type}/src/python/dist/turicreate-${VERSION_NUMBER}*-linux*.whl` - fi + NEW_WHEEL_PATH=${WORKSPACE}/targets/${wheel_name}.whl + fi - # Set Python Language Version Number - NEW_WHEEL_PATH=${WHEEL_PATH} - if [[ "$python35" == "1" ]]; then - NEW_WHEEL_PATH=${WHEEL_PATH/-py3-/-cp35-} - elif [[ "$python36" == "1" ]]; then - NEW_WHEEL_PATH=${WHEEL_PATH/-py3-/-cp36-} - else - NEW_WHEEL_PATH=${WHEEL_PATH/-py2-/-cp27-} - fi + mv ${WHEEL_PATH} ${NEW_WHEEL_PATH} + WHEEL_PATH=${NEW_WHEEL_PATH} + + + if [[ -z $SKIP_SMOKE_TEST ]]; then + # Install the wheel and do a smoke test + unset PYTHONPATH NEW_WHEEL_PATH=${NEW_WHEEL_PATH/linux/manylinux1} if [[ ! "${WHEEL_PATH}" == "${NEW_WHEEL_PATH}" ]]; then diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 7a68f607aa..0000000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ - -subdirs( - external - capi - core - deployment - ml - toolkits - visualization - model_server) - - -if(TC_BUILD_PYTHON) - subdirs(python) - - include_directories(${PYTHON_INCLUDE_DIRS}) - message("Python library = ${PYTHON_LIBRARIES}") - -endif() - diff --git a/src/capi/TuriCreate.h b/src/capi/TuriCreate.h index a2e472d2f8..f69bfd0564 100644 --- a/src/capi/TuriCreate.h +++ b/src/capi/TuriCreate.h @@ -12,6 +12,7 @@ extern "C" { #endif +#include #include #include #include diff --git a/src/capi/TuriCreateEnums.h b/src/capi/TuriCreateEnums.h index d743392bb5..3d36c89a09 100644 --- a/src/capi/TuriCreateEnums.h +++ b/src/capi/TuriCreateEnums.h @@ -10,6 +10,7 @@ #ifdef __cplusplus #include #else +#include #include #endif diff --git a/src/capi/default_server_initializer.cpp b/src/capi/default_server_initializer.cpp index 0e082a3fd0..eb039eb361 100644 --- a/src/capi/default_server_initializer.cpp +++ b/src/capi/default_server_initializer.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/capi/impl/capi_datetime.cpp b/src/capi/impl/capi_datetime.cpp index 47abe1b019..20f26e77e7 100644 --- a/src/capi/impl/capi_datetime.cpp +++ b/src/capi/impl/capi_datetime.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/capi/impl/capi_error_handling.cpp b/src/capi/impl/capi_error_handling.cpp index 753a2b0769..de272d5ac9 100644 --- a/src/capi/impl/capi_error_handling.cpp +++ b/src/capi/impl/capi_error_handling.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_error_handling.hpp b/src/capi/impl/capi_error_handling.hpp index e369f17023..1b90d7ea41 100644 --- a/src/capi/impl/capi_error_handling.hpp +++ b/src/capi/impl/capi_error_handling.hpp @@ -6,6 +6,7 @@ #ifndef TURI_CAPI_ERROR_HANDLING_INTERNAL #define TURI_CAPI_ERROR_HANDLING_INTERNAL +#include #include #include #include diff --git a/src/capi/impl/capi_flex_dict.cpp b/src/capi/impl/capi_flex_dict.cpp index 0685792a5a..4a4ec74142 100644 --- a/src/capi/impl/capi_flex_dict.cpp +++ b/src/capi/impl/capi_flex_dict.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_flex_enum_list.cpp b/src/capi/impl/capi_flex_enum_list.cpp index 6853b3e627..383b040f9e 100644 --- a/src/capi/impl/capi_flex_enum_list.cpp +++ b/src/capi/impl/capi_flex_enum_list.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_flex_image.cpp b/src/capi/impl/capi_flex_image.cpp index 794c04a0a3..2c570e44ac 100644 --- a/src/capi/impl/capi_flex_image.cpp +++ b/src/capi/impl/capi_flex_image.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_flex_list.cpp b/src/capi/impl/capi_flex_list.cpp index cbdd131d6b..9d47f6b6ab 100644 --- a/src/capi/impl/capi_flex_list.cpp +++ b/src/capi/impl/capi_flex_list.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_flexible_type.cpp b/src/capi/impl/capi_flexible_type.cpp index a19566b7cd..e01e3790f9 100644 --- a/src/capi/impl/capi_flexible_type.cpp +++ b/src/capi/impl/capi_flexible_type.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_functions.cpp b/src/capi/impl/capi_functions.cpp index 090395ba82..b29121b2e4 100644 --- a/src/capi/impl/capi_functions.cpp +++ b/src/capi/impl/capi_functions.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/capi/impl/capi_initialization.cpp b/src/capi/impl/capi_initialization.cpp index c36faaf3af..2641f0b98b 100644 --- a/src/capi/impl/capi_initialization.cpp +++ b/src/capi/impl/capi_initialization.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_initialization.hpp b/src/capi/impl/capi_initialization.hpp index cf6566cab2..102a4d90b3 100644 --- a/src/capi/impl/capi_initialization.hpp +++ b/src/capi/impl/capi_initialization.hpp @@ -6,6 +6,7 @@ #ifndef TURI_CAPI_INITIALIZATION #define TURI_CAPI_INITIALIZATION +#include #include namespace turi { diff --git a/src/capi/impl/capi_initialization_internal.hpp b/src/capi/impl/capi_initialization_internal.hpp index c56de18052..c146227728 100644 --- a/src/capi/impl/capi_initialization_internal.hpp +++ b/src/capi/impl/capi_initialization_internal.hpp @@ -19,3 +19,4 @@ static inline void ensure_server_initialized() { } // namespace turi #endif +#include diff --git a/src/capi/impl/capi_memory_management.cpp b/src/capi/impl/capi_memory_management.cpp index 62d106d1b2..1f578d0e77 100644 --- a/src/capi/impl/capi_memory_management.cpp +++ b/src/capi/impl/capi_memory_management.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/capi/impl/capi_models.cpp b/src/capi/impl/capi_models.cpp index 7667c4ec13..eec090bd20 100644 --- a/src/capi/impl/capi_models.cpp +++ b/src/capi/impl/capi_models.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_ndarray.cpp b/src/capi/impl/capi_ndarray.cpp index 9155f134cd..dcd3c7e217 100644 --- a/src/capi/impl/capi_ndarray.cpp +++ b/src/capi/impl/capi_ndarray.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_operators.cpp b/src/capi/impl/capi_operators.cpp index 030a42e523..83005b6ca3 100644 --- a/src/capi/impl/capi_operators.cpp +++ b/src/capi/impl/capi_operators.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include @@ -129,7 +130,7 @@ static inline flexible_type apply_binary_op_ff( case binary_op::OP_GT: return (t > u); case binary_op::OP_GE: - return (t >= u); + return (t <= u); case binary_op::OP_AND: return (t && u); case binary_op::OP_OR: diff --git a/src/capi/impl/capi_parameters.cpp b/src/capi/impl/capi_parameters.cpp index 673a7559f6..8956852900 100644 --- a/src/capi/impl/capi_parameters.cpp +++ b/src/capi/impl/capi_parameters.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_sarray.cpp b/src/capi/impl/capi_sarray.cpp index 022c2e64a1..e0fba95c1b 100644 --- a/src/capi/impl/capi_sarray.cpp +++ b/src/capi/impl/capi_sarray.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_sframe.cpp b/src/capi/impl/capi_sframe.cpp index 889ad83672..78c1ce6539 100644 --- a/src/capi/impl/capi_sframe.cpp +++ b/src/capi/impl/capi_sframe.cpp @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/capi/impl/capi_variant.cpp b/src/capi/impl/capi_variant.cpp index 733ffdffa6..31f18b4452 100644 --- a/src/capi/impl/capi_variant.cpp +++ b/src/capi/impl/capi_variant.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_visualization.cpp b/src/capi/impl/capi_visualization.cpp index fdf8393401..51a634d2c4 100644 --- a/src/capi/impl/capi_visualization.cpp +++ b/src/capi/impl/capi_visualization.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/capi/impl/capi_wrapper_structs.cpp b/src/capi/impl/capi_wrapper_structs.cpp index 1004cddb0b..457706341a 100644 --- a/src/capi/impl/capi_wrapper_structs.cpp +++ b/src/capi/impl/capi_wrapper_structs.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #define DEFINE_CAPI_WRAPPER_STRUCT_TYPE_INFO(struct_name) \ diff --git a/src/capi/impl/capi_wrapper_structs.hpp b/src/capi/impl/capi_wrapper_structs.hpp index b6668bc099..a5380c4c66 100644 --- a/src/capi/impl/capi_wrapper_structs.hpp +++ b/src/capi/impl/capi_wrapper_structs.hpp @@ -6,6 +6,7 @@ #ifndef TURI_CAPI_WRAPPER_STRUCTS_HPP_ #define TURI_CAPI_WRAPPER_STRUCTS_HPP_ +#include #include #include #include diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt deleted file mode 100644 index c935a7f3bc..0000000000 --- a/src/core/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -subdirs(data -generics -globals -logging -parallel -random -storage -system -util) diff --git a/src/core/data/CMakeLists.txt b/src/core/data/CMakeLists.txt deleted file mode 100644 index a2a6b50e6d..0000000000 --- a/src/core/data/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -subdirs( -flexible_type -image -json -sframe -) diff --git a/src/core/data/flexible_type/CMakeLists.txt b/src/core/data/flexible_type/CMakeLists.txt deleted file mode 100644 index 69e944067d..0000000000 --- a/src/core/data/flexible_type/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -project(Turi) - -#/**************************************************************************/ -#/* */ -#/* Logger Library */ -#/* */ -#/**************************************************************************/ - -make_library(flexible_type OBJECT - SOURCES - flexible_type.cpp - string_escape.cpp - flexible_type_conversion_utilities.cpp - flexible_type_spirit_parser.cpp - REQUIRES - logger - image_type - EXTERNAL_VISIBILITY -) diff --git a/src/core/data/flexible_type/flexible_type.cpp b/src/core/data/flexible_type/flexible_type.cpp index ea7e3e7d27..22f80cf588 100644 --- a/src/core/data/flexible_type/flexible_type.cpp +++ b/src/core/data/flexible_type/flexible_type.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type.hpp b/src/core/data/flexible_type/flexible_type.hpp index 1da11c5911..a7f5a4180c 100644 --- a/src/core/data/flexible_type/flexible_type.hpp +++ b/src/core/data/flexible_type/flexible_type.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_base_types.hpp b/src/core/data/flexible_type/flexible_type_base_types.hpp index 541634bf71..fc65452536 100644 --- a/src/core/data/flexible_type/flexible_type_base_types.hpp +++ b/src/core/data/flexible_type/flexible_type_base_types.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_conversion_utilities.cpp b/src/core/data/flexible_type/flexible_type_conversion_utilities.cpp index f055c51266..d39ed5aea3 100644 --- a/src/core/data/flexible_type/flexible_type_conversion_utilities.cpp +++ b/src/core/data/flexible_type/flexible_type_conversion_utilities.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include using namespace turi; diff --git a/src/core/data/flexible_type/flexible_type_conversion_utilities.hpp b/src/core/data/flexible_type/flexible_type_conversion_utilities.hpp index 8d3f1b7409..f7e81266a3 100644 --- a/src/core/data/flexible_type/flexible_type_conversion_utilities.hpp +++ b/src/core/data/flexible_type/flexible_type_conversion_utilities.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_converter.hpp b/src/core/data/flexible_type/flexible_type_converter.hpp index 04e67f24cc..b0bde25266 100644 --- a/src/core/data/flexible_type/flexible_type_converter.hpp +++ b/src/core/data/flexible_type/flexible_type_converter.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_detail.hpp b/src/core/data/flexible_type/flexible_type_detail.hpp index 3920463f39..dd70576aad 100644 --- a/src/core/data/flexible_type/flexible_type_detail.hpp +++ b/src/core/data/flexible_type/flexible_type_detail.hpp @@ -7,6 +7,7 @@ #define TURI_FLEXIBLE_TYPE_DETAIL_HPP #include #include +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_spirit_parser.cpp b/src/core/data/flexible_type/flexible_type_spirit_parser.cpp index a3ea93a3f8..5a89d01c52 100644 --- a/src/core/data/flexible_type/flexible_type_spirit_parser.cpp +++ b/src/core/data/flexible_type/flexible_type_spirit_parser.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // #define BOOST_SPIRIT_DEBUG +#include #include #include #include diff --git a/src/core/data/flexible_type/flexible_type_spirit_parser.hpp b/src/core/data/flexible_type/flexible_type_spirit_parser.hpp index 6cd4d6b4bc..ec3f263a1a 100644 --- a/src/core/data/flexible_type/flexible_type_spirit_parser.hpp +++ b/src/core/data/flexible_type/flexible_type_spirit_parser.hpp @@ -6,6 +6,7 @@ #ifndef TURI_FLEXIBLE_TYPE_SPIRIT_PARSER_HPP #define TURI_FLEXIBLE_TYPE_SPIRIT_PARSER_HPP +#include #include #include diff --git a/src/core/data/flexible_type/json_util.hpp b/src/core/data/flexible_type/json_util.hpp index 0fbf261e86..f2f117d472 100644 --- a/src/core/data/flexible_type/json_util.hpp +++ b/src/core/data/flexible_type/json_util.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_JSON_UTIL_HPP #define TURI_UNITY_JSON_UTIL_HPP +#include #include #include #include diff --git a/src/core/data/flexible_type/ndarray.hpp b/src/core/data/flexible_type/ndarray.hpp index fbbbd90eaf..627eb950ec 100644 --- a/src/core/data/flexible_type/ndarray.hpp +++ b/src/core/data/flexible_type/ndarray.hpp @@ -7,6 +7,7 @@ #define TURI_FLEXIBLE_TYPE_NDARRAY #include #include +#include #include #include namespace turi { diff --git a/src/core/data/flexible_type/string_escape.cpp b/src/core/data/flexible_type/string_escape.cpp index 5521afbfe3..416dbd4e70 100644 --- a/src/core/data/flexible_type/string_escape.cpp +++ b/src/core/data/flexible_type/string_escape.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/data/flexible_type/string_escape.hpp b/src/core/data/flexible_type/string_escape.hpp index 1dac667db1..3a43d9d941 100644 --- a/src/core/data/flexible_type/string_escape.hpp +++ b/src/core/data/flexible_type/string_escape.hpp @@ -6,6 +6,7 @@ #ifndef TURI_FLEXIBLE_TYPE_STRING_ESCAPE_HPP #define TURI_FLEXIBLE_TYPE_STRING_ESCAPE_HPP #include +#include namespace turi { /** diff --git a/src/core/data/flexible_type/string_parser.hpp b/src/core/data/flexible_type/string_parser.hpp index 09e4caf293..8c3ba6be52 100644 --- a/src/core/data/flexible_type/string_parser.hpp +++ b/src/core/data/flexible_type/string_parser.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_FLEXIBLE_TYPE_STRING_PARSER_HPP #define TURI_FLEXIBLE_TYPE_STRING_PARSER_HPP +#include #include #include #include diff --git a/src/core/data/flexible_type/type_traits.hpp b/src/core/data/flexible_type/type_traits.hpp index 16dc02258b..0e2e03d386 100644 --- a/src/core/data/flexible_type/type_traits.hpp +++ b/src/core/data/flexible_type/type_traits.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/src/core/data/image/CMakeLists.txt b/src/core/data/image/CMakeLists.txt deleted file mode 100644 index 78706b631a..0000000000 --- a/src/core/data/image/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -project(Turi) - - -#/**************************************************************************/ -#/* */ -#/* Logger Library */ -#/* */ -#/**************************************************************************/ -make_library(image_type OBJECT - SOURCES - image_type.cpp - image_util_impl.cpp - REQUIRES - logger - image_io - libjpeg - libpng - EXTERNAL_VISIBILITY -) - -make_executable(io_example - SOURCES - io_example.cpp - REQUIRES - unity_shared_for_testing -) - -make_library(image_io OBJECT - SOURCES - io.cpp - jpeg_io.cpp - png_io.cpp - REQUIRES - libpng - libjpeg - logger - fileio - EXTERNAL_VISIBILITY -) - -#set to native if supported -check_cxx_compiler_flag(-Wno-c++11-narrowing HAS_NARROWING) - -if(HAS_NARROWING) - target_compile_options(image_io PRIVATE "-Wno-c++11-narrowing") -endif() diff --git a/src/core/data/image/image_type.cpp b/src/core/data/image/image_type.cpp index bc37a6027d..df75be8d73 100644 --- a/src/core/data/image/image_type.cpp +++ b/src/core/data/image/image_type.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/data/image/image_type.hpp b/src/core/data/image/image_type.hpp index c1aa82f0cd..d4855c9865 100644 --- a/src/core/data/image/image_type.hpp +++ b/src/core/data/image/image_type.hpp @@ -7,6 +7,7 @@ #define TURI_IMAGE_IMAGE_TYPE_HPP #include +#include #include #include #include diff --git a/src/core/data/image/image_util_impl.cpp b/src/core/data/image/image_util_impl.cpp index 5b1390d17a..9dedd6bd1b 100644 --- a/src/core/data/image/image_util_impl.cpp +++ b/src/core/data/image/image_util_impl.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef png_infopp_NULL #define png_infopp_NULL (png_infopp)NULL diff --git a/src/core/data/image/image_util_impl.hpp b/src/core/data/image/image_util_impl.hpp index 22e642552f..2226caabe6 100644 --- a/src/core/data/image/image_util_impl.hpp +++ b/src/core/data/image/image_util_impl.hpp @@ -6,6 +6,7 @@ #ifndef IMAGE_UTIL_IMPL_HPP #define IMAGE_UTIL_IMPL_HPP +#include #include namespace turi { diff --git a/src/core/data/image/io.cpp b/src/core/data/image/io.cpp index 6f0b6fcc66..f66d1087ad 100644 --- a/src/core/data/image/io.cpp +++ b/src/core/data/image/io.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/data/image/io.hpp b/src/core/data/image/io.hpp index 7215d6f980..565dcb56fe 100644 --- a/src/core/data/image/io.hpp +++ b/src/core/data/image/io.hpp @@ -7,6 +7,7 @@ #define TURI_IMAGE_IO_IMPL_HPP #include +#include #include namespace turi { diff --git a/src/core/data/image/io_example.cpp b/src/core/data/image/io_example.cxx similarity index 100% rename from src/core/data/image/io_example.cpp rename to src/core/data/image/io_example.cxx diff --git a/src/core/data/image/io_impl.hpp b/src/core/data/image/io_impl.hpp index 0ecdc62b8e..7855d84571 100644 --- a/src/core/data/image/io_impl.hpp +++ b/src/core/data/image/io_impl.hpp @@ -14,6 +14,7 @@ #define int_p_NULL (int*)NULL #endif +#include #include #include #include diff --git a/src/core/data/image/jpeg_io.cpp b/src/core/data/image/jpeg_io.cpp index c3175e7d5d..7a7a649a0a 100644 --- a/src/core/data/image/jpeg_io.cpp +++ b/src/core/data/image/jpeg_io.cpp @@ -14,6 +14,7 @@ // jpeglib.h however puts some guard protection to avoid redefining INT32 // but of course that only works if I include windows BEFORE jpeglib.h // +#include #include #include #include diff --git a/src/core/data/image/numeric_extension/affine.hpp b/src/core/data/image/numeric_extension/affine.hpp index 9f0913b90e..2ac9ab7280 100755 --- a/src/core/data/image/numeric_extension/affine.hpp +++ b/src/core/data/image/numeric_extension/affine.hpp @@ -14,6 +14,7 @@ #ifndef GIL_AFFINE_HPP #define GIL_AFFINE_HPP +#include #include // point2 //////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/data/image/numeric_extension/algorithm.hpp b/src/core/data/image/numeric_extension/algorithm.hpp index 994ac9c5ad..b66ecb6280 100755 --- a/src/core/data/image/numeric_extension/algorithm.hpp +++ b/src/core/data/image/numeric_extension/algorithm.hpp @@ -26,6 +26,7 @@ #include #include #include +#include #include "../../gil_config.hpp" #include "../../pixel_iterator.hpp" #include "../../metafunctions.hpp" diff --git a/src/core/data/image/numeric_extension/channel_numeric_operations.hpp b/src/core/data/image/numeric_extension/channel_numeric_operations.hpp index e345ddeffe..b0b72866aa 100755 --- a/src/core/data/image/numeric_extension/channel_numeric_operations.hpp +++ b/src/core/data/image/numeric_extension/channel_numeric_operations.hpp @@ -29,6 +29,7 @@ */ #include +#include #include #include diff --git a/src/core/data/image/numeric_extension/convolve.hpp b/src/core/data/image/numeric_extension/convolve.hpp index 32d0b39483..be395e99af 100755 --- a/src/core/data/image/numeric_extension/convolve.hpp +++ b/src/core/data/image/numeric_extension/convolve.hpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "../../gil_config.hpp" #include "../../image_view_factory.hpp" #include "../../algorithm.hpp" diff --git a/src/core/data/image/numeric_extension/kernel.hpp b/src/core/data/image/numeric_extension/kernel.hpp index 06d1204ae4..dcb8d5114d 100755 --- a/src/core/data/image/numeric_extension/kernel.hpp +++ b/src/core/data/image/numeric_extension/kernel.hpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "../../gil_config.hpp" #include "../../utilities.hpp" diff --git a/src/core/data/image/numeric_extension/perspective_projection.hpp b/src/core/data/image/numeric_extension/perspective_projection.hpp index f315404a5c..8bfca86c8a 100644 --- a/src/core/data/image/numeric_extension/perspective_projection.hpp +++ b/src/core/data/image/numeric_extension/perspective_projection.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include namespace warp_perspective { diff --git a/src/core/data/image/numeric_extension/pixel_numeric_operations.hpp b/src/core/data/image/numeric_extension/pixel_numeric_operations.hpp index d8ea04c519..308aff4928 100755 --- a/src/core/data/image/numeric_extension/pixel_numeric_operations.hpp +++ b/src/core/data/image/numeric_extension/pixel_numeric_operations.hpp @@ -28,6 +28,7 @@ */ #include +#include #include #include #include diff --git a/src/core/data/image/numeric_extension/resample.hpp b/src/core/data/image/numeric_extension/resample.hpp index f77e8541e5..d0bed795c1 100755 --- a/src/core/data/image/numeric_extension/resample.hpp +++ b/src/core/data/image/numeric_extension/resample.hpp @@ -14,6 +14,7 @@ #ifndef GIL_RESAMPLE_HPP #define GIL_RESAMPLE_HPP +#include #include #include #include diff --git a/src/core/data/image/numeric_extension/sampler.hpp b/src/core/data/image/numeric_extension/sampler.hpp index e0ab1b3fc4..130aaae9bd 100755 --- a/src/core/data/image/numeric_extension/sampler.hpp +++ b/src/core/data/image/numeric_extension/sampler.hpp @@ -14,6 +14,7 @@ #ifndef GIL_SAMPLER_HPP #define GIL_SAMPLER_HPP +#include #include #include "pixel_numeric_operations.hpp" diff --git a/src/core/data/image/png_io.cpp b/src/core/data/image/png_io.cpp index b8b6f19835..45082e9656 100644 --- a/src/core/data/image/png_io.cpp +++ b/src/core/data/image/png_io.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/data/json/CMakeLists.txt b/src/core/data/json/CMakeLists.txt deleted file mode 100644 index 7cf2ccb960..0000000000 --- a/src/core/data/json/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -project(Turi) diff --git a/src/core/data/json/json_include.hpp b/src/core/data/json/json_include.hpp index a53d231db6..35b22fd5e0 100644 --- a/src/core/data/json/json_include.hpp +++ b/src/core/data/json/json_include.hpp @@ -26,6 +26,7 @@ #endif +#include #include #ifdef __GNUC__ #pragma GCC diagnostic pop diff --git a/src/core/data/sframe/CMakeLists.txt b/src/core/data/sframe/CMakeLists.txt deleted file mode 100644 index 0f94c838a4..0000000000 --- a/src/core/data/sframe/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - - -make_library(gl_sframe OBJECT - SOURCES - gl_gframe.cpp - gl_sarray.cpp - gl_sframe.cpp - gl_sgraph.cpp -) diff --git a/src/core/data/sframe/gl_datatype_registration.cpp b/src/core/data/sframe/gl_datatype_registration.cpp index f16d9bb88f..b32baea1de 100644 --- a/src/core/data/sframe/gl_datatype_registration.cpp +++ b/src/core/data/sframe/gl_datatype_registration.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include namespace turi { diff --git a/src/core/data/sframe/gl_gframe.cpp b/src/core/data/sframe/gl_gframe.cpp index ff3f9c9656..65031d4e25 100644 --- a/src/core/data/sframe/gl_gframe.cpp +++ b/src/core/data/sframe/gl_gframe.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/data/sframe/gl_gframe.hpp b/src/core/data/sframe/gl_gframe.hpp index a0cf5ff3ba..130156a0d9 100644 --- a/src/core/data/sframe/gl_gframe.hpp +++ b/src/core/data/sframe/gl_gframe.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_GL_GFRAME_HPP #define TURI_UNITY_GL_GFRAME_HPP +#include #include "gl_sframe.hpp" namespace turi { diff --git a/src/core/data/sframe/gl_sarray.cpp b/src/core/data/sframe/gl_sarray.cpp index 4aa49aa359..dd3730e56f 100644 --- a/src/core/data/sframe/gl_sarray.cpp +++ b/src/core/data/sframe/gl_sarray.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/data/sframe/gl_sarray.hpp b/src/core/data/sframe/gl_sarray.hpp index 9c8b6f2e38..c98641bdf6 100644 --- a/src/core/data/sframe/gl_sarray.hpp +++ b/src/core/data/sframe/gl_sarray.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_GL_SARRAY_HPP #define TURI_UNITY_GL_SARRAY_HPP +#include #include #include #include diff --git a/src/core/data/sframe/gl_sframe.cpp b/src/core/data/sframe/gl_sframe.cpp index 5417ba6ebc..311c5cc578 100644 --- a/src/core/data/sframe/gl_sframe.cpp +++ b/src/core/data/sframe/gl_sframe.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/data/sframe/gl_sframe.hpp b/src/core/data/sframe/gl_sframe.hpp index 9a49f7a579..bb471d8db7 100644 --- a/src/core/data/sframe/gl_sframe.hpp +++ b/src/core/data/sframe/gl_sframe.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_GL_SFRAME_HPP #define TURI_UNITY_GL_SFRAME_HPP +#include #include #include #include diff --git a/src/core/data/sframe/gl_sgraph.cpp b/src/core/data/sframe/gl_sgraph.cpp index 29846a70fe..5e28c710b7 100644 --- a/src/core/data/sframe/gl_sgraph.cpp +++ b/src/core/data/sframe/gl_sgraph.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/data/sframe/gl_sgraph.hpp b/src/core/data/sframe/gl_sgraph.hpp index 626e71fa98..771acbd848 100644 --- a/src/core/data/sframe/gl_sgraph.hpp +++ b/src/core/data/sframe/gl_sgraph.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_GL_SGRAPH_HPP #define TURI_UNITY_GL_SGRAPH_HPP +#include #include #include #include diff --git a/src/core/export.hpp b/src/core/export.hpp index 29f07c723c..efec068870 100644 --- a/src/core/export.hpp +++ b/src/core/export.hpp @@ -7,3 +7,4 @@ #define TURI_EXPORT_HPP #define EXPORT __attribute__((visibility("default"))) #endif +#include diff --git a/src/core/generics/CMakeLists.txt b/src/core/generics/CMakeLists.txt deleted file mode 100644 index 7cf2ccb960..0000000000 --- a/src/core/generics/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -project(Turi) diff --git a/src/core/generics/blob.hpp b/src/core/generics/blob.hpp index 1b1a4411b5..69ea5bd212 100644 --- a/src/core/generics/blob.hpp +++ b/src/core/generics/blob.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/src/core/generics/gl_string.hpp b/src/core/generics/gl_string.hpp index 8454016a58..6d06ba9441 100644 --- a/src/core/generics/gl_string.hpp +++ b/src/core/generics/gl_string.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GL_STRING_H_ #define TURI_GL_STRING_H_ +#include #include #include #include diff --git a/src/core/generics/gl_vector.hpp b/src/core/generics/gl_vector.hpp index baf8f72e71..cec42fd84e 100644 --- a/src/core/generics/gl_vector.hpp +++ b/src/core/generics/gl_vector.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GL_VECTOR_H_ #define TURI_GL_VECTOR_H_ +#include #include #include #include diff --git a/src/core/generics/hopscotch_map.hpp b/src/core/generics/hopscotch_map.hpp index 948cfb709a..97ab7cfa77 100644 --- a/src/core/generics/hopscotch_map.hpp +++ b/src/core/generics/hopscotch_map.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UTIL_HOPSCOTCH_HASH_HPP #define TURI_UTIL_HOPSCOTCH_HASH_HPP +#include #include #include diff --git a/src/core/generics/hopscotch_set.hpp b/src/core/generics/hopscotch_set.hpp index 0619a0d469..be7281e863 100644 --- a/src/core/generics/hopscotch_set.hpp +++ b/src/core/generics/hopscotch_set.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UTIL_HOPSCOTCH_SET_HPP #define TURI_UTIL_HOPSCOTCH_SET_HPP +#include #include #include diff --git a/src/core/generics/hopscotch_table.hpp b/src/core/generics/hopscotch_table.hpp index 9adf357fb1..c4e51fef25 100644 --- a/src/core/generics/hopscotch_table.hpp +++ b/src/core/generics/hopscotch_table.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #define _HOPSCOTCH_TABLE_DEFAULT_HASH std::hash diff --git a/src/core/generics/is_memmovable.hpp b/src/core/generics/is_memmovable.hpp index b1c995671c..eecf229b4d 100644 --- a/src/core/generics/is_memmovable.hpp +++ b/src/core/generics/is_memmovable.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GENERICS_IS_MEMMOVABLE_HPP #define TURI_GENERICS_IS_MEMMOVABLE_HPP #include +#include // Workaround for libstdc++ < 5.0 #if defined(__GLIBCXX__) && __GLIBCXX__ < 20150801 diff --git a/src/core/generics/remove_member_pointer.hpp b/src/core/generics/remove_member_pointer.hpp index 53118bb6b7..e893d821e1 100644 --- a/src/core/generics/remove_member_pointer.hpp +++ b/src/core/generics/remove_member_pointer.hpp @@ -21,6 +21,7 @@ # include #endif +#include #include #include diff --git a/src/core/generics/sparse_parallel_2d_array.hpp b/src/core/generics/sparse_parallel_2d_array.hpp index 24c5601c75..fffaedc453 100644 --- a/src/core/generics/sparse_parallel_2d_array.hpp +++ b/src/core/generics/sparse_parallel_2d_array.hpp @@ -6,6 +6,7 @@ #ifndef TURI_2D_SPARSE_PARALLEL_ARRAY #define TURI_2D_SPARSE_PARALLEL_ARRAY +#include #include #include #include diff --git a/src/core/generics/string_conversion_internals.hpp b/src/core/generics/string_conversion_internals.hpp index 7aa53fc545..2c705a352c 100644 --- a/src/core/generics/string_conversion_internals.hpp +++ b/src/core/generics/string_conversion_internals.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_STRING_CONVERSION_INTERNALS_H_ diff --git a/src/core/generics/string_internals.hpp b/src/core/generics/string_internals.hpp index b511ae9fc0..281d86a57b 100644 --- a/src/core/generics/string_internals.hpp +++ b/src/core/generics/string_internals.hpp @@ -197,3 +197,4 @@ static inline int compare(const char* s1, const char* s2, size_t n) { }} #endif /* TURI_STRING_INTERNALS_H_ */ +#include diff --git a/src/core/generics/string_serialization.hpp b/src/core/generics/string_serialization.hpp index 031d75f1fa..d4a8f5e9c2 100644 --- a/src/core/generics/string_serialization.hpp +++ b/src/core/generics/string_serialization.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SERIALIZE_GL_STRING_HPP #define TURI_SERIALIZE_GL_STRING_HPP +#include #include #include #include diff --git a/src/core/generics/string_stream_internals.hpp b/src/core/generics/string_stream_internals.hpp index 8d5f560ed8..31ff42a21e 100644 --- a/src/core/generics/string_stream_internals.hpp +++ b/src/core/generics/string_stream_internals.hpp @@ -7,6 +7,7 @@ #define TURI_STRING_STREAM_INTERNALS_H_ #include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/generics/symmetric_2d_array.hpp b/src/core/generics/symmetric_2d_array.hpp index f380e004cb..ecfd20d246 100644 --- a/src/core/generics/symmetric_2d_array.hpp +++ b/src/core/generics/symmetric_2d_array.hpp @@ -7,6 +7,7 @@ #define TURI_SYMMETRIC_ARRAY_H_ #include +#include #include #include diff --git a/src/core/generics/type_trait_def.hpp b/src/core/generics/type_trait_def.hpp index 240422db02..3ac343d08d 100644 --- a/src/core/generics/type_trait_def.hpp +++ b/src/core/generics/type_trait_def.hpp @@ -16,6 +16,7 @@ // $Date$ // $Revision$ +#include #include #define BOOST_TT_AUX_TYPE_TRAIT_DEF1(trait,T,result) \ diff --git a/src/core/generics/type_trait_undef.hpp b/src/core/generics/type_trait_undef.hpp index be30cbb61b..45506065cf 100644 --- a/src/core/generics/type_trait_undef.hpp +++ b/src/core/generics/type_trait_undef.hpp @@ -22,3 +22,4 @@ #undef BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1 #undef BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2 #undef BOOST_TT_AUX_TYPE_TRAIT_IMPL_PARTIAL_SPEC1_1 +#include diff --git a/src/core/generics/value_container_mapper.hpp b/src/core/generics/value_container_mapper.hpp index 9f64103fe4..5a27335c93 100644 --- a/src/core/generics/value_container_mapper.hpp +++ b/src/core/generics/value_container_mapper.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/src/core/generics/value_container_mapper_internal.hpp b/src/core/generics/value_container_mapper_internal.hpp index ea2ef63237..9df8307999 100644 --- a/src/core/generics/value_container_mapper_internal.hpp +++ b/src/core/generics/value_container_mapper_internal.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/src/core/generics/vector_internals.hpp b/src/core/generics/vector_internals.hpp index a64b198f6d..52ad86ba7a 100644 --- a/src/core/generics/vector_internals.hpp +++ b/src/core/generics/vector_internals.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/generics/vector_serialization.hpp b/src/core/generics/vector_serialization.hpp index 2391f69690..f80c39e91b 100644 --- a/src/core/generics/vector_serialization.hpp +++ b/src/core/generics/vector_serialization.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SERIALIZE_GL_VECTOR_HPP #define TURI_SERIALIZE_GL_VECTOR_HPP +#include #include #include #include diff --git a/src/core/globals/CMakeLists.txt b/src/core/globals/CMakeLists.txt deleted file mode 100644 index 3141221844..0000000000 --- a/src/core/globals/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(Turi) - -make_library(globals OBJECT - SOURCES - globals.cpp - REQUIRES - logger - flexible_type - process - EXTERNAL_VISIBILITY -) diff --git a/src/core/globals/global_constants.hpp b/src/core/globals/global_constants.hpp index 93dfd86756..2afde9c8f9 100644 --- a/src/core/globals/global_constants.hpp +++ b/src/core/globals/global_constants.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GLOBALS_GLOBAL_CONSTANTS_HPP #define TURI_GLOBALS_GLOBAL_CONSTANTS_HPP #include +#include namespace turi { extern std::string GLOBALS_MAIN_PROCESS_BINARY; extern std::string GLOBALS_MAIN_PROCESS_PATH; diff --git a/src/core/globals/globals.cpp b/src/core/globals/globals.cpp index 446b78c23f..ea25a0d017 100644 --- a/src/core/globals/globals.cpp +++ b/src/core/globals/globals.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/globals/globals.hpp b/src/core/globals/globals.hpp index 0017d75495..491d022601 100644 --- a/src/core/globals/globals.hpp +++ b/src/core/globals/globals.hpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace turi { class flexible_type; diff --git a/src/core/logging/CMakeLists.txt b/src/core/logging/CMakeLists.txt deleted file mode 100644 index 8afd8f6589..0000000000 --- a/src/core/logging/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -project(Turi) - -#/**************************************************************************/ -#/* */ -#/* Logger Library */ -#/* */ -#/**************************************************************************/ - -make_library(logger OBJECT - SOURCES - error.cpp - logger.cpp - backtrace.cpp - log_rotate.cpp - log_level_setter.cpp - REQUIRES - boost - timer - parallel - cppipc - EXTERNAL_VISIBILITY -) - -subdirs(table_printer) diff --git a/src/core/logging/assertions.hpp b/src/core/logging/assertions.hpp index c7cc562d84..61c5438102 100644 --- a/src/core/logging/assertions.hpp +++ b/src/core/logging/assertions.hpp @@ -44,6 +44,7 @@ #define TURI_LOGGER_THROW_ON_FAILURE #endif +#include #include #include #include diff --git a/src/core/logging/backtrace.cpp b/src/core/logging/backtrace.cpp index 84bc28f3d4..22f9b43310 100644 --- a/src/core/logging/backtrace.cpp +++ b/src/core/logging/backtrace.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #ifndef _WIN32 +#include #include #endif #include diff --git a/src/core/logging/backtrace.hpp b/src/core/logging/backtrace.hpp index 5d7c625157..e95bb43461 100644 --- a/src/core/logging/backtrace.hpp +++ b/src/core/logging/backtrace.hpp @@ -10,3 +10,4 @@ extern void __set_back_trace_file_number(int number); extern void __print_back_trace(); #endif +#include diff --git a/src/core/logging/error.cpp b/src/core/logging/error.cpp index 8a71661b61..b2dcf30e68 100644 --- a/src/core/logging/error.cpp +++ b/src/core/logging/error.cpp @@ -8,6 +8,7 @@ * Error types to distinguish Turi Create errors from arbitrary C++ exceptions */ +#include #include using namespace turi::error; diff --git a/src/core/logging/error.hpp b/src/core/logging/error.hpp index 04ef260562..44e0442105 100644 --- a/src/core/logging/error.hpp +++ b/src/core/logging/error.hpp @@ -13,6 +13,7 @@ #include #include +#include namespace turi { namespace error { diff --git a/src/core/logging/fail_method.hpp b/src/core/logging/fail_method.hpp index b566ed6c72..84091f1374 100644 --- a/src/core/logging/fail_method.hpp +++ b/src/core/logging/fail_method.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_LOGGER_FAIL_METHOD #include +#include #ifdef TURI_LOGGER_THROW_ON_FAILURE #define TURI_LOGGER_FAIL_METHOD(str) throw(str) diff --git a/src/core/logging/log_level_setter.cpp b/src/core/logging/log_level_setter.cpp index 75589ed7f1..e6c742136a 100644 --- a/src/core/logging/log_level_setter.cpp +++ b/src/core/logging/log_level_setter.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include log_level_setter::log_level_setter(int loglevel) { diff --git a/src/core/logging/log_level_setter.hpp b/src/core/logging/log_level_setter.hpp index 6f962884e3..1031801409 100644 --- a/src/core/logging/log_level_setter.hpp +++ b/src/core/logging/log_level_setter.hpp @@ -10,6 +10,7 @@ #ifndef TURI_LOG_LEVEL_SETTER_HPP #define TURI_LOG_LEVEL_SETTER_HPP +#include #include /** diff --git a/src/core/logging/log_rotate.cpp b/src/core/logging/log_rotate.cpp index ff313cee2b..4ab07c97aa 100644 --- a/src/core/logging/log_rotate.cpp +++ b/src/core/logging/log_rotate.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include -#include +#include #include #include #include diff --git a/src/core/logging/log_rotate.hpp b/src/core/logging/log_rotate.hpp index 6da507c0a6..b775fa3c91 100644 --- a/src/core/logging/log_rotate.hpp +++ b/src/core/logging/log_rotate.hpp @@ -7,6 +7,7 @@ #define TURI_LOGGER_LOG_ROTATE_HPP #include #include +#include namespace turi { /** diff --git a/src/core/logging/logger.cpp b/src/core/logging/logger.cpp index b2237cd813..03acc44f80 100644 --- a/src/core/logging/logger.cpp +++ b/src/core/logging/logger.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/logging/logger.hpp b/src/core/logging/logger.hpp index 797e94fe01..0ec1dbce83 100644 --- a/src/core/logging/logger.hpp +++ b/src/core/logging/logger.hpp @@ -45,14 +45,16 @@ #include #endif #include +#include +#include #include -#include +#include #include #include #include #include #include -#include +#include /** * \ingroup turilogger @@ -696,7 +698,7 @@ class file_logger{ /** * Gets a reference to the global logger which all the logging macros use. */ -file_logger& global_logger(); +EXPORT file_logger& global_logger(); /** Wrapper to generate 0 code if the output level is lower than the log level diff --git a/src/core/logging/logger_includes.hpp b/src/core/logging/logger_includes.hpp index 16e44e38e9..34cf5af613 100644 --- a/src/core/logging/logger_includes.hpp +++ b/src/core/logging/logger_includes.hpp @@ -3,5 +3,6 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/logging/table_printer/CMakeLists.txt b/src/core/logging/table_printer/CMakeLists.txt deleted file mode 100644 index e1aff3cbf3..0000000000 --- a/src/core/logging/table_printer/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -project(Turi) - -make_library(table_printer OBJECT - SOURCES - table_printer.cpp - table_element_printers.cpp - REQUIRES - sframe - logger - globals - EXTERNAL_VISIBILITY -) - -make_executable(table_printer_example - SOURCES - table_printer_examples.cpp - REQUIRES - unity_shared_for_testing -) diff --git a/src/core/logging/table_printer/table_element_printers.cpp b/src/core/logging/table_printer/table_element_printers.cpp index 794c07d0f3..00f1d32c09 100644 --- a/src/core/logging/table_printer/table_element_printers.cpp +++ b/src/core/logging/table_printer/table_element_printers.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/logging/table_printer/table_element_printers.hpp b/src/core/logging/table_printer/table_element_printers.hpp index 2594dd89d2..9078f13b61 100644 --- a/src/core/logging/table_printer/table_element_printers.hpp +++ b/src/core/logging/table_printer/table_element_printers.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TABLE_ELEMENT_PRINTERS_H_ #define TURI_TABLE_ELEMENT_PRINTERS_H_ +#include #include #include #include diff --git a/src/core/logging/table_printer/table_printer.cpp b/src/core/logging/table_printer/table_printer.cpp index d2cc282b8b..5942ea7eef 100644 --- a/src/core/logging/table_printer/table_printer.cpp +++ b/src/core/logging/table_printer/table_printer.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include +#include #include #include #include diff --git a/src/core/logging/table_printer/table_printer.hpp b/src/core/logging/table_printer/table_printer.hpp index cc8a2f3d17..343ce744c2 100644 --- a/src/core/logging/table_printer/table_printer.hpp +++ b/src/core/logging/table_printer/table_printer.hpp @@ -6,9 +6,10 @@ #ifndef TURI_TABLE_PRINTER_H_ #define TURI_TABLE_PRINTER_H_ +#include #include #include -#include +#include #include #include #include diff --git a/src/core/logging/table_printer/table_printer_examples.cpp b/src/core/logging/table_printer/table_printer_examples.cxx similarity index 98% rename from src/core/logging/table_printer/table_printer_examples.cpp rename to src/core/logging/table_printer/table_printer_examples.cxx index 10ef67003c..ce5e0e67f3 100644 --- a/src/core/logging/table_printer/table_printer_examples.cpp +++ b/src/core/logging/table_printer/table_printer_examples.cxx @@ -4,7 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include -#include +#include #include #include diff --git a/src/core/parallel/CMakeLists.txt b/src/core/parallel/CMakeLists.txt deleted file mode 100644 index 6124ea677a..0000000000 --- a/src/core/parallel/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -project(Turi) - -make_library(parallel OBJECT - SOURCES - pthread_tools.cpp - thread_pool.cpp - execute_task_in_native_thread.cpp - REQUIRES - platform_config - logger - EXTERNAL_VISIBILITY -) diff --git a/src/core/parallel/atomic.hpp b/src/core/parallel/atomic.hpp index 2d7622d491..90b22e2101 100644 --- a/src/core/parallel/atomic.hpp +++ b/src/core/parallel/atomic.hpp @@ -6,6 +6,7 @@ #ifndef TURI_ATOMIC_HPP #define TURI_ATOMIC_HPP +#include #include #include diff --git a/src/core/parallel/atomic_ops.hpp b/src/core/parallel/atomic_ops.hpp index 4524f09f0a..98748348f4 100644 --- a/src/core/parallel/atomic_ops.hpp +++ b/src/core/parallel/atomic_ops.hpp @@ -7,6 +7,7 @@ #define TURI_ATOMIC_OPS_HPP #include +#include namespace turi { diff --git a/src/core/parallel/deferred_rwlock.hpp b/src/core/parallel/deferred_rwlock.hpp index 95fbc74227..90531b54b9 100644 --- a/src/core/parallel/deferred_rwlock.hpp +++ b/src/core/parallel/deferred_rwlock.hpp @@ -5,6 +5,7 @@ */ #ifndef DEFERRED_RWLOCK_HPP #define DEFERRED_RWLOCK_HPP +#include #include #include #include diff --git a/src/core/parallel/execute_task_in_native_thread.cpp b/src/core/parallel/execute_task_in_native_thread.cpp index 37e7101b99..6f88ace4fc 100644 --- a/src/core/parallel/execute_task_in_native_thread.cpp +++ b/src/core/parallel/execute_task_in_native_thread.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/parallel/execute_task_in_native_thread.hpp b/src/core/parallel/execute_task_in_native_thread.hpp index 75f736c627..2fdfda2d7a 100644 --- a/src/core/parallel/execute_task_in_native_thread.hpp +++ b/src/core/parallel/execute_task_in_native_thread.hpp @@ -6,6 +6,7 @@ #ifndef TURI_PARALLEL_EXECUTE_TASK_IN_NATIVE_THREAD_HPP #define TURI_PARALLEL_EXECUTE_TASK_IN_NATIVE_THREAD_HPP #include +#include namespace turi { diff --git a/src/core/parallel/lambda_omp.hpp b/src/core/parallel/lambda_omp.hpp index 3443ff05e4..ec7137b9c7 100644 --- a/src/core/parallel/lambda_omp.hpp +++ b/src/core/parallel/lambda_omp.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/core/parallel/lockfree_push_back.hpp b/src/core/parallel/lockfree_push_back.hpp index 1b810af4d1..27a3484341 100644 --- a/src/core/parallel/lockfree_push_back.hpp +++ b/src/core/parallel/lockfree_push_back.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_PARALLEL_LOCKFREE_PUSHBACK_HPP #define TURI_PARALLEL_LOCKFREE_PUSHBACK_HPP +#include #include namespace turi { diff --git a/src/core/parallel/mutex.hpp b/src/core/parallel/mutex.hpp index e7fc276a61..e7f98965f7 100644 --- a/src/core/parallel/mutex.hpp +++ b/src/core/parallel/mutex.hpp @@ -7,6 +7,7 @@ #ifndef TURI_MUTEX_HPP #define TURI_MUTEX_HPP +#include #include #include #include diff --git a/src/core/parallel/parallel_includes.hpp b/src/core/parallel/parallel_includes.hpp index ab6f055c65..d75cfb6945 100644 --- a/src/core/parallel/parallel_includes.hpp +++ b/src/core/parallel/parallel_includes.hpp @@ -6,6 +6,7 @@ #ifndef TURI_PARALLEL_PARALLEL_ALL_HPP_ #define TURI_PARALLEL_PARALLEL_ALL_HPP_ +#include #include #include #include diff --git a/src/core/parallel/pthread_h.h b/src/core/parallel/pthread_h.h index 95bba7c4d6..c6d82047b4 100644 --- a/src/core/parallel/pthread_h.h +++ b/src/core/parallel/pthread_h.h @@ -6,6 +6,7 @@ #ifndef TURI_PARALLEL_PTHREAD_INDIRECT_INCLUDE_HPP #define TURI_PARALLEL_PTHREAD_INDIRECT_INCLUDE_HPP #ifdef _WIN32 +#include #include #else #include diff --git a/src/core/parallel/pthread_tools.cpp b/src/core/parallel/pthread_tools.cpp index 7f20569436..8d8d5f8577 100644 --- a/src/core/parallel/pthread_tools.cpp +++ b/src/core/parallel/pthread_tools.cpp @@ -4,13 +4,14 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include #ifdef _WIN32 -#include +#include #endif namespace turi { diff --git a/src/core/parallel/pthread_tools.hpp b/src/core/parallel/pthread_tools.hpp index 0255438f9f..84b8ae33d1 100644 --- a/src/core/parallel/pthread_tools.hpp +++ b/src/core/parallel/pthread_tools.hpp @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/src/core/parallel/queued_rwlock.hpp b/src/core/parallel/queued_rwlock.hpp index 7a2b585695..d9ee4dd71b 100644 --- a/src/core/parallel/queued_rwlock.hpp +++ b/src/core/parallel/queued_rwlock.hpp @@ -159,3 +159,4 @@ class queued_rw_lock{ } #endif +#include diff --git a/src/core/parallel/thread_pool.cpp b/src/core/parallel/thread_pool.cpp index 325427de4b..d267353d0b 100644 --- a/src/core/parallel/thread_pool.cpp +++ b/src/core/parallel/thread_pool.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/parallel/thread_pool.hpp b/src/core/parallel/thread_pool.hpp index c15944ede9..d8708d0269 100644 --- a/src/core/parallel/thread_pool.hpp +++ b/src/core/parallel/thread_pool.hpp @@ -6,6 +6,7 @@ #ifndef TURI_THREAD_POOL_HPP #define TURI_THREAD_POOL_HPP +#include #include #include #include diff --git a/src/core/parallel/winpthreadsll.h b/src/core/parallel/winpthreadsll.h index ad0ce9d025..4d76514dbe 100644 --- a/src/core/parallel/winpthreadsll.h +++ b/src/core/parallel/winpthreadsll.h @@ -52,7 +52,8 @@ #define GRAHPLAB_WIN_PTHREADS #define WIN32_LEAN_AND_MEAN -#include +#include +#include #undef WIN32_LEAN_AND_MEAN #include #include diff --git a/src/core/random/CMakeLists.txt b/src/core/random/CMakeLists.txt deleted file mode 100644 index f002b0882f..0000000000 --- a/src/core/random/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -project(Turi) - -#/**************************************************************************/ -#/* */ -#/* Random Library */ -#/* */ -#/**************************************************************************/ - -if(WIN32) - SET(PLATFORM_DEPENDENCIES crypt32) -endif() - -make_library(random OBJECT - SOURCES - random.cpp - alias.cpp - REQUIRES - boost - logger - parallel - util - ${PLATFORM_DEPENDENCIES} - EXTERNAL_VISIBILITY -) diff --git a/src/core/random/alias.cpp b/src/core/random/alias.cpp index ea3fb9549c..955affbf8b 100644 --- a/src/core/random/alias.cpp +++ b/src/core/random/alias.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/core/random/alias.hpp b/src/core/random/alias.hpp index b82b8e76b8..a25f999058 100644 --- a/src/core/random/alias.hpp +++ b/src/core/random/alias.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace turi { namespace random { diff --git a/src/core/random/random.cpp b/src/core/random/random.cpp index b49cb1d8ea..42ba5b2f8a 100644 --- a/src/core/random/random.cpp +++ b/src/core/random/random.cpp @@ -8,18 +8,19 @@ #include #include +#include #include #include #include #include #include -#include +#include #include #ifdef _WIN32 -#include +#include #include #endif diff --git a/src/core/random/random.hpp b/src/core/random/random.hpp index c9de7fb567..bfa797666d 100644 --- a/src/core/random/random.hpp +++ b/src/core/random/random.hpp @@ -7,6 +7,7 @@ #define TURI_RANDOM_HPP #include +#include #include @@ -15,7 +16,7 @@ #include #include -#include +#include #include namespace turi { diff --git a/src/core/storage/CMakeLists.txt b/src/core/storage/CMakeLists.txt deleted file mode 100644 index f8506a7f7e..0000000000 --- a/src/core/storage/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -subdirs( - fileio - query_engine - serialization - sframe_data - sframe_interface - sgraph_data) diff --git a/src/core/storage/fileio/block_cache.cpp b/src/core/storage/fileio/block_cache.cpp index ebeeb6b0a2..8ea4264ffc 100644 --- a/src/core/storage/fileio/block_cache.cpp +++ b/src/core/storage/fileio/block_cache.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/block_cache.hpp b/src/core/storage/fileio/block_cache.hpp index f6cc2db57c..ac05e5d6ce 100644 --- a/src/core/storage/fileio/block_cache.hpp +++ b/src/core/storage/fileio/block_cache.hpp @@ -6,6 +6,7 @@ #ifndef TURI_FILEIO_BLOCK_CACHE_HPP #define TURI_FILEIO_BLOCK_CACHE_HPP #include +#include #include #include #include diff --git a/src/core/storage/fileio/buffered_writer.hpp b/src/core/storage/fileio/buffered_writer.hpp index e92038f469..d65a5d652a 100644 --- a/src/core/storage/fileio/buffered_writer.hpp +++ b/src/core/storage/fileio/buffered_writer.hpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include +#include +#include +#include +#include namespace turi { /** diff --git a/src/core/storage/fileio/cache_stream.hpp b/src/core/storage/fileio/cache_stream.hpp index 7d9212a4b2..8c181435ff 100644 --- a/src/core/storage/fileio/cache_stream.hpp +++ b/src/core/storage/fileio/cache_stream.hpp @@ -6,8 +6,9 @@ #ifndef TURI_FILEIO_CACHE_STREAM_HPP #define TURI_FILEIO_CACHE_STREAM_HPP -#include -#include +#include +#include +#include namespace turi { namespace fileio{ diff --git a/src/core/storage/fileio/cache_stream_sink.cpp b/src/core/storage/fileio/cache_stream_sink.cpp index 91354abe27..3f3fee2749 100644 --- a/src/core/storage/fileio/cache_stream_sink.cpp +++ b/src/core/storage/fileio/cache_stream_sink.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/storage/fileio/cache_stream_sink.hpp b/src/core/storage/fileio/cache_stream_sink.hpp index 723920c361..f312185a30 100644 --- a/src/core/storage/fileio/cache_stream_sink.hpp +++ b/src/core/storage/fileio/cache_stream_sink.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/cache_stream_source.cpp b/src/core/storage/fileio/cache_stream_source.cpp index 85d809295e..53d7e6e81a 100644 --- a/src/core/storage/fileio/cache_stream_source.cpp +++ b/src/core/storage/fileio/cache_stream_source.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/cache_stream_source.hpp b/src/core/storage/fileio/cache_stream_source.hpp index 0796052a9e..550e1efaff 100644 --- a/src/core/storage/fileio/cache_stream_source.hpp +++ b/src/core/storage/fileio/cache_stream_source.hpp @@ -7,6 +7,7 @@ #define CACHE_STREAM_SOURCE_HPP #include +#include #include #include #include diff --git a/src/core/storage/fileio/curl_downloader.cpp b/src/core/storage/fileio/curl_downloader.cpp index 1d29579e54..ac148a1c7e 100644 --- a/src/core/storage/fileio/curl_downloader.cpp +++ b/src/core/storage/fileio/curl_downloader.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/curl_downloader.hpp b/src/core/storage/fileio/curl_downloader.hpp index 02d754c449..d6272f4240 100644 --- a/src/core/storage/fileio/curl_downloader.hpp +++ b/src/core/storage/fileio/curl_downloader.hpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace turi { /** diff --git a/src/core/storage/fileio/dmlcio/filesys.h b/src/core/storage/fileio/dmlcio/filesys.h new file mode 100644 index 0000000000..06d191a5d8 --- /dev/null +++ b/src/core/storage/fileio/dmlcio/filesys.h @@ -0,0 +1,88 @@ +/* Copyright © 2017 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + */ +/*! + * Copyright (c) 2015 by Contributors + * \file filesystem.h + * \brief general file system io interface + * \author Tianqi Chen + */ +#ifndef DMLC_IO_FILESYS_H_ +#define DMLC_IO_FILESYS_H_ + +#include +#include + +#include +#include +#include +#include +#include "io.h" + +namespace dmlc { +namespace io { +/*! \brief common data structure for URI */ +struct URI { + /*! \brief protocol */ + std::string protocol; + /*! + * \brief host name, namenode for HDFS, bucket name for s3 + */ + std::string host; + /*! \brief name of the path */ + std::string name; + /*! \brief enable default constructor */ + URI(void) {} + /*! + * \brief construct from URI string + */ + explicit URI(const char *uri) { + const char *p = std::strstr(uri, "://"); + if (p == NULL) { + name = uri; + } else { + protocol = std::string(uri, p - uri + 3); + // defensive, in case caller forget to lower case the protocol + boost::algorithm::to_lower_copy(protocol.begin(), protocol); + uri = p + 3; + p = std::strchr(uri, '/'); + if (p == NULL) { + host = uri; name = '/'; + } else { + host = std::string(uri, p - uri); + name = p; + } + } + } + /*! \brief string representation */ + inline std::string str(void) const { + return protocol + host + name; + } +}; + +/*! \brief type of file */ +enum FileType { + /*! \brief the file is file */ + kFile, + /*! \brief the file is directory */ + kDirectory +}; + +/*! \brief use to store file information */ +struct FileInfo { + /*! \brief full path to the file */ + URI path; + /*! \brief the size of the file */ + size_t size; + /*! \brief the type of the file */ + FileType type; + /*! \brief default constructor */ + FileInfo() : size(0), type(kFile) {} +}; + + +} // namespace io +} // namespace dmlc +#endif // DMLC_IO_FILESYS_H_ diff --git a/src/core/storage/fileio/dmlcio/io.h b/src/core/storage/fileio/dmlcio/io.h new file mode 100644 index 0000000000..9e3d03376a --- /dev/null +++ b/src/core/storage/fileio/dmlcio/io.h @@ -0,0 +1,100 @@ +/* Copyright © 2017 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + */ +/*! + * Copyright (c) 2015 by Contributors + * \file io.h + * \brief defines serializable interface of dmlc + */ +#ifndef DMLC_IO_H_ +#define DMLC_IO_H_ +#include +#include +#include +#include +#include +#include + +// include uint64_t only to make io standalone +#ifdef _MSC_VER +typedef unsigned __int64 uint64_t; +#else +#include +#include +#endif + +/*! \brief namespace for dmlc */ +namespace dmlc { +/*! + * \brief interface of stream I/O for serialization + */ +class Stream { + public: + /*! + * \brief reads data from a stream + * \param ptr pointer to a memory buffer + * \param size block size + * \return the size of data read + */ + virtual size_t Read(void *ptr, size_t size) = 0; + /*! + * \brief writes data to a stream + * \param ptr pointer to a memory buffer + * \param size block size + */ + virtual void Write(const void *ptr, size_t size) = 0; + + /*! + * \brief closes the stream + */ + virtual void Close() = 0; + + /*! \brief virtual destructor */ + virtual ~Stream(void) {} + /*! + * \brief generic factory function + * create an stream, the stream will close the underlying files upon deletion + * + * \param uri the uri of the input currently we support + * hdfs://, s3://, and file:// by default file:// will be used + * \param flag can be "w", "r", "a" + * \param allow_null whether NULL can be returned, or directly report error + * \return the created stream, can be NULL when allow_null == true and file do not exist + */ + static Stream *Create(const char *uri, + const char* const flag, + bool allow_null = false); +}; + +/*! \brief interface of i/o stream that support seek */ +class SeekStream: public Stream { + public: + // virtual destructor + virtual ~SeekStream(void) {} + /*! \brief seek to certain position of the file */ + virtual void Seek(size_t pos) = 0; + /*! \brief tell the position of the stream */ + virtual size_t Tell(void) = 0; + /*! \brief Returns true if at end of stream */ + virtual bool AtEnd(void) const = 0; + /*! + * \brief closes the stream + */ + virtual void Close() = 0; + /*! + * \brief generic factory function + * create an SeekStream for read only, + * the stream will close the underlying files upon deletion + * error will be reported and the system will exit when create failed + * \param uri the uri of the input currently we support + * hdfs://, s3://, and file:// by default file:// will be used + * \param allow_null whether NULL can be returned, or directly report error + * \return the created stream, can be NULL when allow_null == true and file do not exist + */ + static SeekStream *CreateForRead(const char *uri, + bool allow_null = false); +}; +} // namespace dmlc +#endif // DMLC_IO_H_ diff --git a/src/core/storage/fileio/dmlcio/s3_filesys.cpp b/src/core/storage/fileio/dmlcio/s3_filesys.cpp new file mode 100644 index 0000000000..14e1e9a323 --- /dev/null +++ b/src/core/storage/fileio/dmlcio/s3_filesys.cpp @@ -0,0 +1,950 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +extern "C" { +#include +#include +#include +#include +#include +#include +} +#include "io.h" +#include +#include +#include + +using turi::fileio::set_curl_options; +using turi::fileio::get_bucket_path; + +/*! + * \brief safely get the beginning address of a vector + * \param vec input vector + * \return beginning address of a vector + */ +template +static inline T *BeginPtr(std::vector &vec) { + if (vec.size() == 0) { + return NULL; + } else { + return &vec[0]; + } +} +/*! \brief get the beginning address of a vector */ +template +static inline const T *BeginPtr(const std::vector &vec) { + if (vec.size() == 0) { + return NULL; + } else { + return &vec[0]; + } +} +static inline char* BeginPtr(std::string &str) { + if (str.length() == 0) return NULL; + return &str[0]; +} +static inline const char* BeginPtr(const std::string &str) { + if (str.length() == 0) return NULL; + return &str[0]; +} + +namespace dmlc { +namespace io { +/*! \brief namespace for helper utils */ +namespace s3 { +// simple XML parser +struct XMLIter { + // content of xml + const char *content_; + // end of content + const char *cend_; + explicit XMLIter() + : content_(NULL), cend_(NULL) { + } + // constructor + explicit XMLIter(const char *content) + : content_(content) { + cend_ = content_ + strlen(content_); + } + /*! \brief convert to string */ + inline std::string str(void) const { + if (content_ >= cend_) return std::string(""); + return std::string(content_, cend_ - content_); + } + /*! + * \brief get next value of corresponding key in xml string + * \param key the key in xml field + * \param value the return value if success + * \return if the get is success + */ + inline bool GetNext(const char *key, + XMLIter *value) { + std::string begin = std::string("<") + key +">"; + std::string end = std::string(""; + const char *pbegin = strstr(content_, begin.c_str()); + if (pbegin == NULL || pbegin > cend_) return false; + content_ = pbegin + begin.size(); + const char *pend = strstr(content_, end.c_str()); + ASSERT_MSG(pend != NULL, "bad xml format"); + value->content_ = content_; + value->cend_ = pend; + content_ = pend + end.size(); + return true; + } +}; +/*! + * \brief return a base64 encodes string + * \param md the data + * \param len the length of data + * \return the encoded string + */ +static std::string Base64(unsigned char md[], unsigned len) { + // encode base64 + BIO *fp = BIO_push(BIO_new(BIO_f_base64()), + BIO_new(BIO_s_mem())); + BIO_write(fp, md, len); + BIO_ctrl(fp, BIO_CTRL_FLUSH, 0, NULL); + BUF_MEM *res; + BIO_get_mem_ptr(fp, &res); + std::string ret(res->data, res->length - 1); + BIO_free_all(fp); + return ret; +} +/*! + * \brief sign given AWS secret key + * \param secret_key the key to compute the sign + * \param content the content to sign + */ +static std::string Sign(const std::string &key, const std::string &content) { + HMAC_CTX ctx; + unsigned char md[EVP_MAX_MD_SIZE]; + unsigned rlen = 0; + HMAC_CTX_init(&ctx); + HMAC_Init(&ctx, key.c_str(), key.length(), EVP_sha1()); + HMAC_Update(&ctx, + reinterpret_cast(content.c_str()), + content.length()); + HMAC_Final(&ctx, md, &rlen); + HMAC_CTX_cleanup(&ctx); + return Base64(md, rlen); +} + +// sign AWS key +static std::string Sign(const std::string &key, + const std::string &method, + const std::string &content_md5, + const std::string &content_type, + const std::string &date, + std::vector amz_headers, + const std::string &resource) { + std::ostringstream stream; + stream << method << "\n"; + stream << content_md5 << "\n"; + stream << content_type << "\n"; + stream << date << "\n"; + std::sort(amz_headers.begin(), amz_headers.end()); + for (size_t i = 0; i < amz_headers.size(); ++i) { + stream << amz_headers[i] << "\n"; + } + stream << resource; + return Sign(key, stream.str()); +} + +static std::string ComputeMD5(const std::string &buf) { + if (buf.length() == 0) return ""; + const int kLen = 128 / 8; + unsigned char md[kLen]; + MD5(reinterpret_cast(buf.c_str()), + buf.length(), md); + return Base64(md, kLen); +} +// remove the beginning slash at name +inline const char *RemoveBeginSlash(const std::string &name) { + const char *s = name.c_str(); + while (*s == '/') { + ++s; + } + return s; +} +// fin dthe error field of the header +static inline bool FindHttpError(const std::string &header) { + std::string hd, ret; + int code; + std::istringstream is(header); + if (is >> hd >> code >> ret) { + if (code == 206 || ret == "OK") { + return false; + } else if (ret == "Continue") { + return false; + } + } + return true; +} +/*! + * \brief get the datestring needed by AWS + * \return datestring + */ +inline std::string GetDateString(void) { + time_t t = time(NULL); + tm gmt; + gmtime_r(&t, &gmt); + char buf[256]; + strftime(buf, 256, "%a, %d %b %Y %H:%M:%S GMT", &gmt); + return std::string(buf); +} +// curl callback to write sstream +size_t WriteSStreamCallback(char *buf, size_t size, size_t count, void *fp) { + static_cast(fp)->write(buf, size * count); + return size * count; +} +// callback by curl to write to std::string +size_t WriteStringCallback(char *buf, size_t size, size_t count, void *fp) { + size *= count; + std::string *str = static_cast(fp); + size_t len = str->length(); + str->resize(len + size); + std::memcpy(BeginPtr(*str) + len, buf, size); + return size; +} + +// useful callback for reading memory +struct ReadStringStream { + const char *dptr; + size_t nleft; + // constructor + ReadStringStream(const std::string &data) { + dptr = BeginPtr(data); + nleft = data.length(); + } + // curl callback to write sstream + static size_t Callback(char *buf, size_t size, size_t count, void *fp) { + size *= count; + ReadStringStream *s = static_cast(fp); + size_t nread = std::min(size, s->nleft); + std::memcpy(buf, s->dptr, nread); + s->dptr += nread; s->nleft -= nread; + return nread; + } +}; + +/*! + * \brief reader stream that can be used to read from CURL + */ +class CURLReadStreamBase : public SeekStream { + public: + virtual ~CURLReadStreamBase() { + Close(); + } + virtual void Close() { + this->Cleanup(); + } + + virtual size_t Tell(void) { + return curr_bytes_; + } + virtual bool AtEnd(void) const { + return at_end_; + } + virtual void Write(const void *ptr, size_t size) { + logstream(LOG_FATAL) << "CURL.ReadStream cannot be used for write" << std::endl; + } + // lazy seek function + virtual void Seek(size_t pos) { + if (curr_bytes_ != pos) { + this->Cleanup(); + curr_bytes_ = pos; + } + } + virtual size_t Read(void *ptr, size_t size); + + protected: + CURLReadStreamBase() + : mcurl_(NULL), ecurl_(NULL), slist_(NULL), + read_ptr_(0), curr_bytes_(0), at_end_(false) { + } + /*! + * \brief initialize the ecurl request, + * \param begin_bytes the beginning bytes of the stream + * \param ecurl a curl easy handle that can be used to set request + * \param slist a curl slist handle that can be used to set headers + */ + virtual void InitRequest(size_t begin_bytes, + CURL *ecurl, + curl_slist **slist) = 0; + + protected: + // the total size of the file + size_t expect_file_size_ = 0; + + private: + /*! + * \brief called by child class to initialize read + * \param begin_bytes the beginning bytes of the stream + */ + void Init(size_t begin_bytes); + /*! + * \brief cleanup the previous session for restart + */ + void Cleanup(void); + /*! + * \brief try to fill the buffer with at least wanted bytes + * \param want_bytes number of bytes we want to fill + * \return number of remainning running curl handles + */ + int FillBuffer(size_t want_bytes); + // multi and easy curl handle + CURL *mcurl_, *ecurl_; + // slist needed by the program + curl_slist *slist_; + // data buffer + std::string buffer_; + // header buffer + std::string header_; + // data pointer to read position + size_t read_ptr_; + // current position in the stream + size_t curr_bytes_; + // mark end of stream + bool at_end_; +}; + +// read data in +size_t CURLReadStreamBase::Read(void *ptr, size_t size) { + // lazy initialize + if (mcurl_ == NULL) Init(curr_bytes_); + // check at end + if (at_end_) return 0; + + size_t nleft = size; + char *buf = reinterpret_cast(ptr); + + size_t retry_count = 0; + while(nleft != 0) { + while (nleft != 0) { + if (read_ptr_ == buffer_.length()) { + read_ptr_ = 0; buffer_.clear(); + if (this->FillBuffer(nleft) == 0 && buffer_.length() == 0) { + at_end_ = true; + break; + } + } + size_t nread = std::min(nleft, buffer_.length() - read_ptr_); + std::memcpy(buf, BeginPtr(buffer_) + read_ptr_, nread); + buf += nread; read_ptr_ += nread; nleft -= nread; + } + size_t read_bytes = size - nleft; + curr_bytes_ += read_bytes; + + // retry + if (retry_count < 5 && nleft > 0 && + at_end_ && expect_file_size_ != 0 && + curr_bytes_ != expect_file_size_) { + // reestablish connection; + size_t old_curr_bytes = curr_bytes_; + Cleanup(); + Init(old_curr_bytes); + ++retry_count; + } else { + break; + } + } + return size - nleft; +} + +// cleanup the previous sessions for restart +void CURLReadStreamBase::Cleanup() { + if (mcurl_ != NULL) { + curl_multi_remove_handle(mcurl_, ecurl_); + curl_easy_cleanup(ecurl_); + curl_multi_cleanup(mcurl_); + mcurl_ = NULL; + ecurl_ = NULL; + } + if (slist_ != NULL) { + curl_slist_free_all(slist_); + slist_ = NULL; + } + buffer_.clear(); header_.clear(); + curr_bytes_ = 0; at_end_ = false; +} + +void CURLReadStreamBase::Init(size_t begin_bytes) { + ASSERT_MSG(mcurl_ == NULL && ecurl_ == NULL && + slist_ == NULL, "must call init in clean state"); + // make request + ecurl_ = curl_easy_init(); + this->InitRequest(begin_bytes, ecurl_, &slist_); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_WRITEFUNCTION, WriteStringCallback) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_WRITEDATA, &buffer_) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_HEADERFUNCTION, WriteStringCallback) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_HEADERDATA, &header_) == CURLE_OK); + set_curl_options(ecurl_); + curl_easy_setopt(ecurl_, CURLOPT_NOSIGNAL, 1); + mcurl_ = curl_multi_init(); + ASSERT_TRUE(curl_multi_add_handle(mcurl_, ecurl_) == CURLM_OK); + int nrun; + curl_multi_perform(mcurl_, &nrun); + ASSERT_TRUE(nrun != 0 || header_.length() != 0 || buffer_.length() != 0); + // start running and check header + this->FillBuffer(1); + if (FindHttpError(header_)) { + while (this->FillBuffer(buffer_.length() + 256) != 0); + std::string message = std::string("Request Error") + header_ + buffer_; + log_and_throw_io_failure(message); + } + // setup the variables + at_end_ = false; + curr_bytes_ = begin_bytes; + read_ptr_ = 0; +} + +// fill the buffer with wanted bytes +int CURLReadStreamBase::FillBuffer(size_t nwant) { + int nrun = 0; + while (buffer_.length() < nwant) { + // wait for the event of read ready + fd_set fdread; + fd_set fdwrite; + fd_set fdexcep; + FD_ZERO(&fdread); + FD_ZERO(&fdwrite); + FD_ZERO(&fdexcep); + int maxfd = -1; + // Curl default timeout as in: https://curl.haxx.se/libcurl/c/curl_multi_timeout.html + timeval timeout; + long curl_timeo = 0; + curl_multi_timeout(mcurl_, &curl_timeo); + if (curl_timeo < 0) curl_timeo = 980; + timeout.tv_sec = curl_timeo / 1000; + timeout.tv_usec = (curl_timeo % 1000) * 1000; + ASSERT_TRUE(curl_multi_fdset(mcurl_, &fdread, &fdwrite, &fdexcep, &maxfd) == CURLM_OK); + int rc; + if (maxfd == -1) { +#ifdef _WIN32 + Sleep(100); + rc = 0; +#else + struct timeval wait = { 0, 100 * 1000 }; + rc = select(0, NULL, NULL, NULL, &wait); +#endif + } else { + rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout); + } + if (rc != -1) { + CURLMcode ret = curl_multi_perform(mcurl_, &nrun); + if (ret == CURLM_CALL_MULTI_PERFORM) continue; + ASSERT_TRUE(ret == CURLM_OK); + if (nrun == 0) break; + } + } + // loop through all the subtasks in curl_multi_perform and look for errors + struct CURLMsg *m; + do { + int msgq = 0; + m = curl_multi_info_read(mcurl_, &msgq); + if(m && (m->msg == CURLMSG_DONE)) { + if (m->data.result != CURLE_OK) { + logstream(LOG_ERROR) << curl_easy_strerror(m->data.result) << std::endl; + } + } + } while(m); + + return nrun; +} +// End of CURLReadStreamBase functions + +// singleton class for global initialization +struct CURLGlobal { + CURLGlobal() { + ASSERT_TRUE(curl_global_init(CURL_GLOBAL_DEFAULT) == CURLE_OK); + } + ~CURLGlobal() { + curl_global_cleanup(); + } +}; + +// used for global initialization +static CURLGlobal curl_global; + +/*! \brief reader stream that can be used to read */ +class ReadStream : public CURLReadStreamBase { + public: + ReadStream(const URI &path, + const std::string &aws_id, + const std::string &aws_key, + size_t file_size) + : path_(path), aws_id_(aws_id), aws_key_(aws_key) { + this->expect_file_size_ = file_size; + } + virtual ~ReadStream(void) {} + + protected: + // implement InitRequest + virtual void InitRequest(size_t begin_bytes, + CURL *ecurl, + curl_slist **slist); + + private: + // path we are reading + URI path_; + // aws access key and id + std::string aws_id_, aws_key_; +}; + +// initialize the reader at begin bytes +void ReadStream::InitRequest(size_t begin_bytes, + CURL *ecurl, + curl_slist **slist) { + // initialize the curl request + std::vector amz; + std::string date = GetDateString(); + + auto lowerhost = boost::algorithm::to_lower_copy(path_.host); + std::string signature = Sign(aws_key_, "GET", "", "", date, amz, + std::string("/") + lowerhost + '/' + RemoveBeginSlash(path_.name)); + // generate headers + std::ostringstream sauth, sdate, surl, srange; + std::ostringstream result; + sauth << "Authorization: AWS " << aws_id_ << ":" << signature; + sdate << "Date: " << date; + surl << get_bucket_path(path_.host) + << RemoveBeginSlash(path_.name); + srange << "Range: bytes=" << begin_bytes << "-"; + *slist = curl_slist_append(*slist, sdate.str().c_str()); + *slist = curl_slist_append(*slist, srange.str().c_str()); + *slist = curl_slist_append(*slist, sauth.str().c_str()); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_HTTPHEADER, *slist) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_URL, surl.str().c_str()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_HTTPGET, 1L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_HEADER, 0L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_NOSIGNAL, 1) == CURLE_OK); +} + +/*! \brief simple http read stream to check */ +class HttpReadStream : public CURLReadStreamBase { + public: + HttpReadStream(const URI &path) + : path_(path) {} + // implement InitRequest + virtual void InitRequest(size_t begin_bytes, + CURL *ecurl, + curl_slist **slist) { + ASSERT_MSG(begin_bytes == 0, " HttpReadStream: do not support Seek"); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_URL, path_.str().c_str()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl, CURLOPT_NOSIGNAL, 1) == CURLE_OK); + } + + private: + URI path_; +}; + +class WriteStream : public Stream { + public: + WriteStream(const URI &path, + const std::string &aws_id, + const std::string &aws_key) + : path_(path), aws_id_(aws_id), + aws_key_(aws_key) { + const char *buz = getenv("DMLC_S3_WRITE_BUFFER_MB"); + if (buz != NULL) { + max_buffer_size_ = static_cast(atol(buz)) << 20UL; + } else { + // 64 MB + const size_t kDefaultBufferSize = 64 << 20UL; + max_buffer_size_ = kDefaultBufferSize; + } + max_error_retry_ = 3; + ecurl_ = curl_easy_init(); + this->Init(); + } + virtual size_t Read(void *ptr, size_t size) { + logstream(LOG_FATAL) << "S3.WriteStream cannot be used for read" << std::endl; + return 0; + } + virtual void Write(const void *ptr, size_t size); + // destructor + virtual ~WriteStream() { + if (!closed_) { + no_exception_ = true; + this->Upload(true); + this->Finish(); + curl_easy_cleanup(ecurl_); + } + } + + virtual void Close() { + closed_ = true; + this->Upload(true); + this->Finish(); + curl_easy_cleanup(ecurl_); + } + + private: + // internal maximum buffer size + size_t max_buffer_size_; + // maximum time of retry when error occurs + int max_error_retry_; + // path we are reading + URI path_; + // aws access key and id + std::string aws_id_, aws_key_; + // easy curl handle used for the request + CURL *ecurl_; + // upload_id used by AWS + std::string upload_id_; + // write data buffer + std::string buffer_; + // etags of each part we uploaded + std::vector etags_; + // part id of each part we uploaded + std::vector part_ids_; + + bool closed_ = false; + + bool no_exception_ = false; + /*! + * \brief helper function to do http post request + * \param method method to peform + * \param path the resource to post + * \param url_args additional arguments in URL + * \param url_args translated arguments to sign + * \param content_type content type of the data + * \param data data to post + * \param out_header holds output Header + * \param out_data holds output data + */ + void Run(const std::string &method, + const URI &path, + const std::string &args, + const std::string &content_type, + const std::string &data, + std::string *out_header, + std::string *out_data); + /*! + * \brief initialize the upload request + */ + void Init(void); + /*! + * \brief upload the buffer to S3, store the etag + * clear the buffer + */ + void Upload(bool force_upload_even_if_zero_bytes = false); + /*! + * \brief commit the upload and finish the session + */ + void Finish(void); +}; + +void WriteStream::Write(const void *ptr, size_t size) { + size_t rlen = buffer_.length(); + buffer_.resize(rlen + size); + std::memcpy(BeginPtr(buffer_) + rlen, ptr, size); + if (buffer_.length() >= max_buffer_size_) { + this->Upload(); + } +} + +void WriteStream::Run(const std::string &method, + const URI &path, + const std::string &args, + const std::string &content_type, + const std::string &data, + std::string *out_header, + std::string *out_data) { + // initialize the curl request + std::vector amz; + std::string md5str = ComputeMD5(data); + std::string date = GetDateString(); + auto lowerhost = boost::algorithm::to_lower_copy(path.host); + std::string signature = Sign(aws_key_, method.c_str(), md5str, + content_type, date, amz, + std::string("/") + lowerhost + '/' + + RemoveBeginSlash(path_.name) + args); + + // generate headers + std::ostringstream sauth, sdate, surl, scontent, smd5; + std::ostringstream rheader, rdata; + sauth << "Authorization: AWS " << aws_id_ << ":" << signature; + sdate << "Date: " << date; + surl << get_bucket_path(path.host) + << RemoveBeginSlash(path_.name) << args; + scontent << "Content-Type: " << content_type; + // list + curl_slist *slist = NULL; + slist = curl_slist_append(slist, sdate.str().c_str()); + slist = curl_slist_append(slist, scontent.str().c_str()); + if (md5str.length() != 0) { + smd5 << "Content-MD5: " << md5str; + slist = curl_slist_append(slist, smd5.str().c_str()); + } + slist = curl_slist_append(slist, sauth.str().c_str()); + + int num_retry = 0; + while (true) { + // helper for read string + ReadStringStream ss(data); + curl_easy_reset(ecurl_); + auto surlstring = surl.str(); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_HTTPHEADER, slist) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_URL, surlstring.c_str()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_HEADER, 0L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_WRITEFUNCTION, WriteSStreamCallback) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_WRITEDATA, &rdata) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_WRITEHEADER, WriteSStreamCallback) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_HEADERDATA, &rheader) == CURLE_OK); + set_curl_options(ecurl_); + curl_easy_setopt(ecurl_, CURLOPT_NOSIGNAL, 1); + if (method == "POST") { + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_POST, 0L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_POSTFIELDSIZE, data.length()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_POSTFIELDS, BeginPtr(data)) == CURLE_OK); + } else if (method == "PUT") { + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_PUT, 1L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_READDATA, &ss) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_INFILESIZE_LARGE, data.length()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(ecurl_, CURLOPT_READFUNCTION, ReadStringStream::Callback) == CURLE_OK); + } + CURLcode ret = curl_easy_perform(ecurl_); + if (ret != CURLE_OK) { + logstream(LOG_ERROR) << "request " << "failed with error " + << curl_easy_strerror(ret) << " Progress " + << etags_.size() << " uploaded " << " retry=" << num_retry << std::endl; + num_retry += 1; + if(num_retry >= max_error_retry_) { + log_and_throw_io_failure("Maximum retry time reached"); + } + curl_easy_cleanup(ecurl_); + ecurl_ = curl_easy_init(); + } else { + break; + } + } + curl_slist_free_all(slist); + *out_header = rheader.str(); + *out_data = rdata.str(); + if (FindHttpError(*out_header) || + out_data->find("") != std::string::npos) { + if (!no_exception_) { + log_and_throw_io_failure(std::string("AWS S3 Error:") + *out_header + *out_data); + } + } +} +void WriteStream::Init(void) { + std::string rheader, rdata; + Run("POST", path_, "?uploads", + "binary/octel-stream", "", &rheader, &rdata); + XMLIter xml(rdata.c_str()); + XMLIter upid; + ASSERT_MSG(xml.GetNext("UploadId", &upid), "missing UploadId"); + upload_id_ = upid.str(); +} + +void WriteStream::Upload(bool force_upload_even_if_zero_bytes) { + if (buffer_.length() == 0 && !force_upload_even_if_zero_bytes) return; + std::ostringstream sarg; + std::string rheader, rdata; + size_t partno = etags_.size() + 1; + + sarg << "?partNumber=" << partno << "&uploadId=" << upload_id_; + Run("PUT", path_, sarg.str(), + "binary/octel-stream", buffer_, &rheader, &rdata); + const char *p = strcasestr(rheader.c_str(), "ETag: "); + ASSERT_MSG((p != NULL), "cannot find ETag in header"); + p += 6; + const char *end = strchr(p + 1, '\n'); + auto etag = std::string(p, end - p + 1); + etag = boost::algorithm::trim_copy_if(etag, boost::algorithm::is_any_of(" \"\r\n")); + + etags_.push_back(etag); + part_ids_.push_back(partno); + buffer_.clear(); +} + +void WriteStream::Finish(void) { + std::ostringstream sarg, sdata; + std::string rheader, rdata; + sarg << "?uploadId=" << upload_id_; + sdata << "\n"; + ASSERT_TRUE(etags_.size() == part_ids_.size()); + for (size_t i = 0; i < etags_.size(); ++i) { + sdata << " \n" + << " " << part_ids_[i] << "\n" + << " " << etags_[i] << "\n" + << " \n"; + } + sdata << "\n"; + Run("POST", path_, sarg.str(), + "text/xml", sdata.str(), &rheader, &rdata); +} +/*! + * \brief list the objects in the bucket with prefix specified by path.name + * \param path the path to query + * \param aws_id access id of aws + * \param aws_key access key of aws + * \paam out_list stores the output results + */ +void ListObjects(const URI &path, + const std::string aws_id, + const std::string aws_key, + std::vector *out_list) { + if(path.host.length() == 0) { + log_and_throw_io_failure("bucket name not specified in S3 URI"); + } + out_list->clear(); + std::vector amz; + std::string date = GetDateString(); + auto lowerhost = boost::algorithm::to_lower_copy(path.host); + std::string signature = Sign(aws_key, "GET", "", "", date, amz, + std::string("/") + lowerhost + "/"); + + std::ostringstream sauth, sdate, surl; + std::ostringstream result; + sauth << "Authorization: AWS " << aws_id << ":" << signature; + sdate << "Date: " << date; + surl << get_bucket_path(path.host) + << "?delimiter=/&prefix=" << RemoveBeginSlash(path.name); + // make request + CURL *curl = curl_easy_init(); + curl_slist *slist = NULL; + slist = curl_slist_append(slist, sdate.str().c_str()); + slist = curl_slist_append(slist, sauth.str().c_str()); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_URL, surl.str().c_str()) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteSStreamCallback) == CURLE_OK); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_WRITEDATA, &result) == CURLE_OK); + set_curl_options(curl); + ASSERT_TRUE(curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1) == CURLE_OK); + CURLcode performret = curl_easy_perform(curl); + ASSERT_EQ(performret, CURLE_OK); + curl_slist_free_all(slist); + curl_easy_cleanup(curl); + // parse xml + std::string ret = result.str(); + if (ret.find("") != std::string::npos) { + log_and_throw_io_failure(ret); + } + {// get files + XMLIter xml(ret.c_str()); + XMLIter data; + ASSERT_MSG((xml.GetNext("IsTruncated", &data)), "missing IsTruncated"); + ASSERT_MSG((data.str() == "false"), "the returning list is truncated"); + while (xml.GetNext("Contents", &data)) { + FileInfo info; + info.path = path; + XMLIter value; + ASSERT_TRUE(data.GetNext("Key", &value)); + // add root path to be consistent with other filesys convention + info.path.name = '/' + value.str(); + ASSERT_TRUE(data.GetNext("Size", &value)); + info.size = static_cast(atol(value.str().c_str())); + info.type = kFile; + out_list->push_back(info); + } + } + {// get directories + XMLIter xml(ret.c_str()); + XMLIter data; + while (xml.GetNext("CommonPrefixes", &data)) { + FileInfo info; + info.path = path; + XMLIter value; + ASSERT_TRUE(data.GetNext("Prefix", &value)); + // add root path to be consistent with other filesys convention + info.path.name = '/' + value.str(); + info.size = 0; info.type = kDirectory; + out_list->push_back(info); + } + } +} +} // namespace s3 + +void S3FileSystem::SetCredentials(const std::string& aws_access_id, + const std::string& aws_secret_key) { + aws_access_id_ = aws_access_id; + aws_secret_key_ = aws_secret_key; +} + +bool S3FileSystem::TryGetPathInfo(const URI &path_, FileInfo *out_info) { + URI path = path_; + while (path.name.length() > 1 && + *path.name.rbegin() == '/') { + path.name.resize(path.name.length() - 1); + } + std::vector files; + s3::ListObjects(path, aws_access_id_, aws_secret_key_, &files); + std::string pdir = path.name + '/'; + for (size_t i = 0; i < files.size(); ++i) { + if (files[i].path.name == path.name) { + *out_info = files[i]; return true; + } + if (files[i].path.name == pdir) { + *out_info = files[i]; return true; + } + } + return false; +} + +FileInfo S3FileSystem::GetPathInfo(const URI &path) { + ASSERT_MSG(path.protocol == "s3://", " S3FileSystem.ListDirectory"); + FileInfo info; + ASSERT_TRUE(TryGetPathInfo(path, &info)); + return info; +} +void S3FileSystem::ListDirectory(const URI &path, std::vector *out_list) { + ASSERT_MSG(path.protocol == "s3://", " S3FileSystem.ListDirectory"); + if (path.name[path.name.length() - 1] == '/') { + s3::ListObjects(path, aws_access_id_, + aws_secret_key_, out_list); + return; + } + std::vector files; + std::string pdir = path.name + '/'; + out_list->clear(); + s3::ListObjects(path, aws_access_id_, + aws_secret_key_, &files); + for (size_t i = 0; i < files.size(); ++i) { + if (files[i].path.name == path.name) { + ASSERT_TRUE(files[i].type == kFile); + out_list->push_back(files[i]); + return; + } + if (files[i].path.name == pdir) { + ASSERT_TRUE(files[i].type == kDirectory); + s3::ListObjects(files[i].path, aws_access_id_, + aws_secret_key_, out_list); + return; + } + } +} + +Stream *S3FileSystem::Open(const URI &path, const char* const flag) { + using namespace std; + if (!strcmp(flag, "r") || !strcmp(flag, "rb")) { + return OpenForRead(path); + } else if (!strcmp(flag, "w") || !strcmp(flag, "wb")) { + ASSERT_MSG((path.protocol == "s3://"), " S3FileSystem.Open"); + return new s3::WriteStream(path, aws_access_id_, aws_secret_key_); + }else { + log_and_throw_io_failure(std::string("S3FileSytem.Open do not support flag ") + flag); + return NULL; + } +} + +SeekStream *S3FileSystem::OpenForRead(const URI &path) { + ASSERT_MSG((path.protocol == "s3://"), " S3FileSystem.Open"); + FileInfo info; + if (TryGetPathInfo(path, &info) && info.type == kFile) { + return new s3::ReadStream(path, aws_access_id_, aws_secret_key_, info.size); + } else { + return NULL; + } +} +} // namespace io +} // namespace dmlc diff --git a/src/core/storage/fileio/dmlcio/s3_filesys.h b/src/core/storage/fileio/dmlcio/s3_filesys.h new file mode 100644 index 0000000000..4422ab9386 --- /dev/null +++ b/src/core/storage/fileio/dmlcio/s3_filesys.h @@ -0,0 +1,90 @@ +/* Copyright © 2017 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + */ +/*! + * Copyright (c) 2015 by Contributors + * \file s3_filesys.h + * \brief S3 access module + * \author Tianqi Chen + */ +#ifndef DMLC_IO_S3_FILESYS_H_ +#define DMLC_IO_S3_FILESYS_H_ + +#ifndef TC_DISABLE_REMOTEFS + + +#include +#include +#include +#include "./io.h" +#include "./filesys.h" + +namespace dmlc { +namespace io { +/*! \brief AWS S3 filesystem */ +class S3FileSystem { + public: + /*! \brief constructor */ + S3FileSystem() = default; + + void SetCredentials(const std::string& aws_access_id, + const std::string& aws_secret_key); + + /*! \brief destructor */ + virtual ~S3FileSystem() {} + /*! + * \brief get information about a path + * \param path the path to the file + * \return the information about the file + */ + virtual FileInfo GetPathInfo(const URI &path); + /*! + * \brief list files in a directory + * \param path to the file + * \param out_list the output information about the files + */ + virtual void ListDirectory(const URI &path, std::vector *out_list); + /*! + * \brief open a stream, will report error and exit if bad thing happens + * NOTE: the Stream can continue to work even when filesystem was destructed + * \param path path to file + * \param uri the uri of the input + * \param flag can be "w", "r", "a" + * \return the created stream, can be NULL when allow_null == true and file do not exist + */ + virtual Stream *Open(const URI &path, const char* const flag); + /*! + * \brief open a seekable stream for read + * \param path the path to the file + * \return the created stream, can be NULL + */ + virtual SeekStream *OpenForRead(const URI &path); + /*! + * \brief get a singleton of S3FileSystem when needed + * \return a singleton instance + */ + inline static S3FileSystem *GetInstance(void) { + static S3FileSystem instance; + return &instance; + } + + private: + /*! \brief AWS access id */ + std::string aws_access_id_; + /*! \brief AWS secret key */ + std::string aws_secret_key_; + /*! + * \brief try to get information about a path + * \param path the path to the file + * \param out_info holds the path info + * \return return false when path do not exist + */ + bool TryGetPathInfo(const URI &path, FileInfo *info); +}; +} // namespace io +} // namespace dmlc +#endif + +#endif diff --git a/src/core/storage/fileio/file_download_cache.cpp b/src/core/storage/fileio/file_download_cache.cpp index 3ed209d971..5a372ec80e 100644 --- a/src/core/storage/fileio/file_download_cache.cpp +++ b/src/core/storage/fileio/file_download_cache.cpp @@ -3,6 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include +#include +#include #include #include #include diff --git a/src/core/storage/fileio/file_download_cache.hpp b/src/core/storage/fileio/file_download_cache.hpp index 3281eae326..51bc447312 100644 --- a/src/core/storage/fileio/file_download_cache.hpp +++ b/src/core/storage/fileio/file_download_cache.hpp @@ -8,6 +8,7 @@ #include #include // this is a circular dependency that needs to be eliminated +#include #include namespace turi { diff --git a/src/core/storage/fileio/file_handle_pool.cpp b/src/core/storage/fileio/file_handle_pool.cpp index 25abf45862..5afd42d5f5 100644 --- a/src/core/storage/fileio/file_handle_pool.cpp +++ b/src/core/storage/fileio/file_handle_pool.cpp @@ -6,6 +6,7 @@ #ifndef TURI_FILEIO_FILE_HANDLE_POOL_CPP #define TURI_FILEIO_FILE_HANDLE_POOL_CPP +#include #include #include #include diff --git a/src/core/storage/fileio/file_handle_pool.hpp b/src/core/storage/fileio/file_handle_pool.hpp index 9cdfac237a..209def4f72 100644 --- a/src/core/storage/fileio/file_handle_pool.hpp +++ b/src/core/storage/fileio/file_handle_pool.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include namespace turi { diff --git a/src/core/storage/fileio/file_ownership_handle.hpp b/src/core/storage/fileio/file_ownership_handle.hpp index 5aef6e61f4..d601b00921 100644 --- a/src/core/storage/fileio/file_ownership_handle.hpp +++ b/src/core/storage/fileio/file_ownership_handle.hpp @@ -7,6 +7,7 @@ #define TURI_FILEIO_FILE_OWNERSHIP_HANDLE_HPP #include #include +#include #include #include namespace turi { diff --git a/src/core/storage/fileio/fileio_constants.cpp b/src/core/storage/fileio/fileio_constants.cpp index 1bc8f5cbff..ab748c747c 100644 --- a/src/core/storage/fileio/fileio_constants.cpp +++ b/src/core/storage/fileio/fileio_constants.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/fileio_constants.hpp b/src/core/storage/fileio/fileio_constants.hpp index 3c4c4eec08..f9cf131542 100644 --- a/src/core/storage/fileio/fileio_constants.hpp +++ b/src/core/storage/fileio/fileio_constants.hpp @@ -6,6 +6,7 @@ #ifndef TURI_FILEIO_FILEIO_CONSTANTS_HPP #define TURI_FILEIO_FILEIO_CONSTANTS_HPP #include +#include namespace turi { namespace fileio { diff --git a/src/core/storage/fileio/fixed_size_cache_manager.cpp b/src/core/storage/fileio/fixed_size_cache_manager.cpp index 384d83277a..b061c6a87f 100644 --- a/src/core/storage/fileio/fixed_size_cache_manager.cpp +++ b/src/core/storage/fileio/fixed_size_cache_manager.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/fixed_size_cache_manager.hpp b/src/core/storage/fileio/fixed_size_cache_manager.hpp index a86cae80ee..40d46653b8 100644 --- a/src/core/storage/fileio/fixed_size_cache_manager.hpp +++ b/src/core/storage/fileio/fixed_size_cache_manager.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/fs_utils.cpp b/src/core/storage/fileio/fs_utils.cpp index b249fb5b69..081431ec79 100644 --- a/src/core/storage/fileio/fs_utils.cpp +++ b/src/core/storage/fileio/fs_utils.cpp @@ -4,6 +4,8 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include +#include #include #include #include diff --git a/src/core/storage/fileio/fs_utils.hpp b/src/core/storage/fileio/fs_utils.hpp index c192bb52dc..3ed217294d 100644 --- a/src/core/storage/fileio/fs_utils.hpp +++ b/src/core/storage/fileio/fs_utils.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/storage/fileio/general_fstream.cpp b/src/core/storage/fileio/general_fstream.cpp index e14e69d9c0..332eff70f7 100644 --- a/src/core/storage/fileio/general_fstream.cpp +++ b/src/core/storage/fileio/general_fstream.cpp @@ -4,8 +4,10 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include +#include #include #include #include diff --git a/src/core/storage/fileio/general_fstream.hpp b/src/core/storage/fileio/general_fstream.hpp index f23e889683..97b3b27f93 100644 --- a/src/core/storage/fileio/general_fstream.hpp +++ b/src/core/storage/fileio/general_fstream.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/general_fstream_sink.cpp b/src/core/storage/fileio/general_fstream_sink.cpp index 82cb1e6f60..11dab169df 100644 --- a/src/core/storage/fileio/general_fstream_sink.cpp +++ b/src/core/storage/fileio/general_fstream_sink.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/general_fstream_sink.hpp b/src/core/storage/fileio/general_fstream_sink.hpp index 242e9c294d..4f7f7129d4 100644 --- a/src/core/storage/fileio/general_fstream_sink.hpp +++ b/src/core/storage/fileio/general_fstream_sink.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/general_fstream_source.cpp b/src/core/storage/fileio/general_fstream_source.cpp index bf3195ef21..5ad16f8fdf 100644 --- a/src/core/storage/fileio/general_fstream_source.cpp +++ b/src/core/storage/fileio/general_fstream_source.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/general_fstream_source.hpp b/src/core/storage/fileio/general_fstream_source.hpp index 97560b5856..ab0605788a 100644 --- a/src/core/storage/fileio/general_fstream_source.hpp +++ b/src/core/storage/fileio/general_fstream_source.hpp @@ -7,6 +7,7 @@ #define FILEIO_GENERAL_FSTREAM_SOURCE_HPP #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/get_s3_endpoint.cpp b/src/core/storage/fileio/get_s3_endpoint.cpp index 2e4532b8f6..6c85f3ef81 100644 --- a/src/core/storage/fileio/get_s3_endpoint.cpp +++ b/src/core/storage/fileio/get_s3_endpoint.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/fileio/get_s3_endpoint.hpp b/src/core/storage/fileio/get_s3_endpoint.hpp index b289d26a60..ba9a7cc57a 100644 --- a/src/core/storage/fileio/get_s3_endpoint.hpp +++ b/src/core/storage/fileio/get_s3_endpoint.hpp @@ -7,6 +7,7 @@ #define TURI_FILEIO_GET_S3_ENDPOINT_HPP #include #include +#include #include namespace turi { diff --git a/src/core/storage/fileio/hdfs.cpp b/src/core/storage/fileio/hdfs.cpp index 2d0a40e65d..611c318c5c 100644 --- a/src/core/storage/fileio/hdfs.cpp +++ b/src/core/storage/fileio/hdfs.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/hdfs.hpp b/src/core/storage/fileio/hdfs.hpp index 98d5ff41e2..9c4d440223 100644 --- a/src/core/storage/fileio/hdfs.hpp +++ b/src/core/storage/fileio/hdfs.hpp @@ -37,6 +37,7 @@ extern "C" { #include #include +#include #include #include diff --git a/src/core/storage/fileio/libhdfs_shim.cpp b/src/core/storage/fileio/libhdfs_shim.cpp index d376da2cd8..f34e0d7f5c 100644 --- a/src/core/storage/fileio/libhdfs_shim.cpp +++ b/src/core/storage/fileio/libhdfs_shim.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // libhdfs shim library +#include #include #include #include @@ -13,12 +14,12 @@ #include #include #include -#include +#include #ifdef HAS_HADOOP #ifndef _WIN32 #include #else -#include +#include #include #endif extern "C" { diff --git a/src/core/storage/fileio/read_caching_device.hpp b/src/core/storage/fileio/read_caching_device.hpp index fe5197813c..bdcd8de0f2 100644 --- a/src/core/storage/fileio/read_caching_device.hpp +++ b/src/core/storage/fileio/read_caching_device.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_FILEIO_CACHING_DEVICE_HPP #define TURI_FILEIO_CACHING_DEVICE_HPP +#include #include #include #include diff --git a/src/core/storage/fileio/s3_api.cpp b/src/core/storage/fileio/s3_api.cpp index eed24ffa98..85d7b77174 100644 --- a/src/core/storage/fileio/s3_api.cpp +++ b/src/core/storage/fileio/s3_api.cpp @@ -7,6 +7,7 @@ #ifndef TC_DISABLE_REMOTEFS #ifndef _WIN32 +#include #include #else #include diff --git a/src/core/storage/fileio/s3_api.hpp b/src/core/storage/fileio/s3_api.hpp index 61b5930404..edd69f6664 100644 --- a/src/core/storage/fileio/s3_api.hpp +++ b/src/core/storage/fileio/s3_api.hpp @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include namespace turi { diff --git a/src/core/storage/fileio/s3_fstream.cpp b/src/core/storage/fileio/s3_fstream.cpp index d09449f661..ea0fa54489 100644 --- a/src/core/storage/fileio/s3_fstream.cpp +++ b/src/core/storage/fileio/s3_fstream.cpp @@ -4,6 +4,8 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include +#include #include #include #include diff --git a/src/core/storage/fileio/s3_fstream.hpp b/src/core/storage/fileio/s3_fstream.hpp index 8f3e9783db..842b90a4c1 100644 --- a/src/core/storage/fileio/s3_fstream.hpp +++ b/src/core/storage/fileio/s3_fstream.hpp @@ -4,6 +4,9 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include +#include +#include #include #include #include diff --git a/src/core/storage/fileio/sanitize_url.cpp b/src/core/storage/fileio/sanitize_url.cpp index e1ec2c9c1f..dd6a4f36b0 100644 --- a/src/core/storage/fileio/sanitize_url.cpp +++ b/src/core/storage/fileio/sanitize_url.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/fileio/sanitize_url.hpp b/src/core/storage/fileio/sanitize_url.hpp index 278806d893..6c6c8d8a9a 100644 --- a/src/core/storage/fileio/sanitize_url.hpp +++ b/src/core/storage/fileio/sanitize_url.hpp @@ -6,6 +6,7 @@ #ifndef FILEIO_SANITIZE_URL_HPP #define FILEIO_SANITIZE_URL_HPP #include +#include namespace turi { /** * \ingroup fileio diff --git a/src/core/storage/fileio/set_curl_options.cpp b/src/core/storage/fileio/set_curl_options.cpp index c84e617054..4ced200b7c 100644 --- a/src/core/storage/fileio/set_curl_options.cpp +++ b/src/core/storage/fileio/set_curl_options.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/set_curl_options.hpp b/src/core/storage/fileio/set_curl_options.hpp index a8114ed99a..afa7e20051 100644 --- a/src/core/storage/fileio/set_curl_options.hpp +++ b/src/core/storage/fileio/set_curl_options.hpp @@ -17,3 +17,4 @@ void set_curl_options(void* ecurl); } } #endif +#include diff --git a/src/core/storage/fileio/temp_files.cpp b/src/core/storage/fileio/temp_files.cpp index a769b8d1ae..c4531d7bd8 100644 --- a/src/core/storage/fileio/temp_files.cpp +++ b/src/core/storage/fileio/temp_files.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #ifndef _WIN32 +#include #include #else -#include +#include #include #endif @@ -27,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/core/storage/fileio/temp_files.hpp b/src/core/storage/fileio/temp_files.hpp index dc100d6b23..46df011acf 100644 --- a/src/core/storage/fileio/temp_files.hpp +++ b/src/core/storage/fileio/temp_files.hpp @@ -7,6 +7,7 @@ #define FILEIO_TEMP_FILE_HPP #include #include +#include namespace turi { diff --git a/src/core/storage/fileio/union_fstream.cpp b/src/core/storage/fileio/union_fstream.cpp index 971b517340..adf8f06ae0 100644 --- a/src/core/storage/fileio/union_fstream.cpp +++ b/src/core/storage/fileio/union_fstream.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/fileio/union_fstream.hpp b/src/core/storage/fileio/union_fstream.hpp index 68a8634623..b6ddd7b779 100644 --- a/src/core/storage/fileio/union_fstream.hpp +++ b/src/core/storage/fileio/union_fstream.hpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace turi { diff --git a/src/core/storage/lazy_eval/lazy_eval_operation.hpp b/src/core/storage/lazy_eval/lazy_eval_operation.hpp index e3328156d6..f3080f072d 100644 --- a/src/core/storage/lazy_eval/lazy_eval_operation.hpp +++ b/src/core/storage/lazy_eval/lazy_eval_operation.hpp @@ -7,6 +7,7 @@ #define TURI_LAZY_EVAL_OPERATION_HPP #include #include +#include namespace turi { diff --git a/src/core/storage/lazy_eval/lazy_eval_operation_dag.hpp b/src/core/storage/lazy_eval/lazy_eval_operation_dag.hpp index dcbf89092c..d4f1215aff 100644 --- a/src/core/storage/lazy_eval/lazy_eval_operation_dag.hpp +++ b/src/core/storage/lazy_eval/lazy_eval_operation_dag.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/CMakeLists.txt b/src/core/storage/query_engine/CMakeLists.txt deleted file mode 100644 index 49066918f7..0000000000 --- a/src/core/storage/query_engine/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -project(Turi) - -make_library(sframe_query_engine OBJECT - SOURCES - planning/optimizations/optimization_transforms.cpp - planning/optimization_engine.cpp - planning/planner_node.cpp - planning/planner.cpp - execution/subplan_executor.cpp - execution/execution_node.cpp - execution/query_context.cpp - operators/operator_properties.cpp - operators/operator_transformations.cpp - algorithm/sort.cpp - algorithm/sort_and_merge.cpp - algorithm/groupby_aggregate.cpp - algorithm/ec_sort.cpp - algorithm/ec_permute.cpp - query_engine_lock.cpp - REQUIRES - sframe flexible_type pylambda - EXTERNAL_VISIBILITY -) diff --git a/src/core/storage/query_engine/algorithm/ec_permute.cpp b/src/core/storage/query_engine/algorithm/ec_permute.cpp index 6f33c38ff3..7a02022648 100644 --- a/src/core/storage/query_engine/algorithm/ec_permute.cpp +++ b/src/core/storage/query_engine/algorithm/ec_permute.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/algorithm/ec_permute.hpp b/src/core/storage/query_engine/algorithm/ec_permute.hpp index 278da20d46..c4402f7271 100644 --- a/src/core/storage/query_engine/algorithm/ec_permute.hpp +++ b/src/core/storage/query_engine/algorithm/ec_permute.hpp @@ -9,6 +9,7 @@ #include #include +#include /* * See ec_sort.hpp for details */ diff --git a/src/core/storage/query_engine/algorithm/ec_sort.cpp b/src/core/storage/query_engine/algorithm/ec_sort.cpp index bacf3a61c7..20c3df353d 100644 --- a/src/core/storage/query_engine/algorithm/ec_sort.cpp +++ b/src/core/storage/query_engine/algorithm/ec_sort.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/algorithm/ec_sort.hpp b/src/core/storage/query_engine/algorithm/ec_sort.hpp index 5d942c48f1..14d6d2dccd 100644 --- a/src/core/storage/query_engine/algorithm/ec_sort.hpp +++ b/src/core/storage/query_engine/algorithm/ec_sort.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { class sframe; diff --git a/src/core/storage/query_engine/algorithm/groupby_aggregate.cpp b/src/core/storage/query_engine/algorithm/groupby_aggregate.cpp index cd64981ba4..56bb33b878 100644 --- a/src/core/storage/query_engine/algorithm/groupby_aggregate.cpp +++ b/src/core/storage/query_engine/algorithm/groupby_aggregate.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/algorithm/groupby_aggregate.hpp b/src/core/storage/query_engine/algorithm/groupby_aggregate.hpp index 1a9525dd0c..b2b84658bc 100644 --- a/src/core/storage/query_engine/algorithm/groupby_aggregate.hpp +++ b/src/core/storage/query_engine/algorithm/groupby_aggregate.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/storage/query_engine/algorithm/sort.cpp b/src/core/storage/query_engine/algorithm/sort.cpp index 67aec51c6e..b052a9ddd9 100644 --- a/src/core/storage/query_engine/algorithm/sort.cpp +++ b/src/core/storage/query_engine/algorithm/sort.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/algorithm/sort.hpp b/src/core/storage/query_engine/algorithm/sort.hpp index 56b4c0e205..78dc78ae0b 100644 --- a/src/core/storage/query_engine/algorithm/sort.hpp +++ b/src/core/storage/query_engine/algorithm/sort.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/core/storage/query_engine/algorithm/sort_and_merge.cpp b/src/core/storage/query_engine/algorithm/sort_and_merge.cpp index 037ca32289..e1100cfc02 100644 --- a/src/core/storage/query_engine/algorithm/sort_and_merge.cpp +++ b/src/core/storage/query_engine/algorithm/sort_and_merge.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace turi { namespace query_eval { diff --git a/src/core/storage/query_engine/algorithm/sort_and_merge.hpp b/src/core/storage/query_engine/algorithm/sort_and_merge.hpp index baf8d610e5..8c1f4ced25 100644 --- a/src/core/storage/query_engine/algorithm/sort_and_merge.hpp +++ b/src/core/storage/query_engine/algorithm/sort_and_merge.hpp @@ -10,6 +10,7 @@ namespace turi { namespace query_eval { #include +#include /** * \ingroup sframe_query_engine * \addtogroup Algorithms Algorithms diff --git a/src/core/storage/query_engine/algorithm/sort_comparator.hpp b/src/core/storage/query_engine/algorithm/sort_comparator.hpp index bebd0f8bd1..a2739275a7 100644 --- a/src/core/storage/query_engine/algorithm/sort_comparator.hpp +++ b/src/core/storage/query_engine/algorithm/sort_comparator.hpp @@ -6,6 +6,7 @@ #ifndef TURI_QUERY_EVAL_SORT_COMPARATOR_HPP #define TURI_QUERY_EVAL_SORT_COMPARATOR_HPP +#include #include namespace turi { diff --git a/src/core/storage/query_engine/execution/execution_node.cpp b/src/core/storage/query_engine/execution/execution_node.cpp index 205cc35203..a9e80544f3 100644 --- a/src/core/storage/query_engine/execution/execution_node.cpp +++ b/src/core/storage/query_engine/execution/execution_node.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/execution/execution_node.hpp b/src/core/storage/query_engine/execution/execution_node.hpp index 47a41b230c..d78d48179d 100644 --- a/src/core/storage/query_engine/execution/execution_node.hpp +++ b/src/core/storage/query_engine/execution/execution_node.hpp @@ -11,6 +11,7 @@ #include +#include #include #include #include diff --git a/src/core/storage/query_engine/execution/query_context.cpp b/src/core/storage/query_engine/execution/query_context.cpp index 9b0f642f6d..ba5a795735 100644 --- a/src/core/storage/query_engine/execution/query_context.cpp +++ b/src/core/storage/query_engine/execution/query_context.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/execution/query_context.hpp b/src/core/storage/query_engine/execution/query_context.hpp index d6becdab45..93fe24e91e 100644 --- a/src/core/storage/query_engine/execution/query_context.hpp +++ b/src/core/storage/query_engine/execution/query_context.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_QUERY_ENGINE_OPERATORS_QUERY_CONTEXT_HPP #include #include +#include #include namespace turi { namespace query_eval { diff --git a/src/core/storage/query_engine/execution/subplan_executor.cpp b/src/core/storage/query_engine/execution/subplan_executor.cpp index 0e92c937a8..d78cbd991d 100644 --- a/src/core/storage/query_engine/execution/subplan_executor.cpp +++ b/src/core/storage/query_engine/execution/subplan_executor.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/execution/subplan_executor.hpp b/src/core/storage/query_engine/execution/subplan_executor.hpp index d7cd2c3816..b19a0234f8 100644 --- a/src/core/storage/query_engine/execution/subplan_executor.hpp +++ b/src/core/storage/query_engine/execution/subplan_executor.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/src/core/storage/query_engine/operators/all_operators.hpp b/src/core/storage/query_engine/operators/all_operators.hpp index 5e0c73f752..ef3a247b6b 100644 --- a/src/core/storage/query_engine/operators/all_operators.hpp +++ b/src/core/storage/query_engine/operators/all_operators.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_ALL_OPERATORS_H_ #define TURI_SFRAME_QUERY_ALL_OPERATORS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/append.hpp b/src/core/storage/query_engine/operators/append.hpp index 58d4d35b24..1083c6c5b5 100644 --- a/src/core/storage/query_engine/operators/append.hpp +++ b/src/core/storage/query_engine/operators/append.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_APPEND_HPP #define TURI_SFRAME_QUERY_MANAGER_APPEND_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/binary_transform.hpp b/src/core/storage/query_engine/operators/binary_transform.hpp index da6d78b010..a0bc30cd16 100644 --- a/src/core/storage/query_engine/operators/binary_transform.hpp +++ b/src/core/storage/query_engine/operators/binary_transform.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_QUERY_MANAGER_BINARY_TRANSFORM_HPP #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/constant.hpp b/src/core/storage/query_engine/operators/constant.hpp index b78493f178..997c499d91 100644 --- a/src/core/storage/query_engine/operators/constant.hpp +++ b/src/core/storage/query_engine/operators/constant.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_CONSTANT_HPP #define TURI_SFRAME_QUERY_MANAGER_CONSTANT_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/generalized_transform.hpp b/src/core/storage/query_engine/operators/generalized_transform.hpp index b3b75f2d6e..f80792798b 100644 --- a/src/core/storage/query_engine/operators/generalized_transform.hpp +++ b/src/core/storage/query_engine/operators/generalized_transform.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_GENERALIZED_TRANSFORM_HPP #define TURI_SFRAME_QUERY_MANAGER_GENERALIZED_TRANSFORM_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/generalized_union_project.hpp b/src/core/storage/query_engine/operators/generalized_union_project.hpp index 31b761da6f..7f8c7961e5 100644 --- a/src/core/storage/query_engine/operators/generalized_union_project.hpp +++ b/src/core/storage/query_engine/operators/generalized_union_project.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_GENERALIZED_UNION_PROJECT_NODE_HPP #define TURI_SFRAME_QUERY_MANAGER_GENERALIZED_UNION_PROJECT_NODE_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/lambda_transform.hpp b/src/core/storage/query_engine/operators/lambda_transform.hpp index 37059568ab..1e89f9f64c 100644 --- a/src/core/storage/query_engine/operators/lambda_transform.hpp +++ b/src/core/storage/query_engine/operators/lambda_transform.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_LAMBDA_TRANSFORM_HPP #define TURI_SFRAME_QUERY_MANAGER_LAMBDA_TRANSFORM_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/logical_filter.hpp b/src/core/storage/query_engine/operators/logical_filter.hpp index 0ec8cbdc10..0f15601a0a 100644 --- a/src/core/storage/query_engine/operators/logical_filter.hpp +++ b/src/core/storage/query_engine/operators/logical_filter.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_LOGICAL_FILTER_HPP #define TURI_SFRAME_QUERY_MANAGER_LOGICAL_FILTER_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/operator.hpp b/src/core/storage/query_engine/operators/operator.hpp index 1e6a14cbf3..239851a428 100644 --- a/src/core/storage/query_engine/operators/operator.hpp +++ b/src/core/storage/query_engine/operators/operator.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/operator_properties.cpp b/src/core/storage/query_engine/operators/operator_properties.cpp index f0487798ac..2586ec7c73 100644 --- a/src/core/storage/query_engine/operators/operator_properties.cpp +++ b/src/core/storage/query_engine/operators/operator_properties.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/operator_properties.hpp b/src/core/storage/query_engine/operators/operator_properties.hpp index f711d680a9..7ee10c7a99 100644 --- a/src/core/storage/query_engine/operators/operator_properties.hpp +++ b/src/core/storage/query_engine/operators/operator_properties.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_ENGINE_INFER_OPERATOR_FIELD_H_ #define TURI_SFRAME_QUERY_ENGINE_INFER_OPERATOR_FIELD_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/operator_transformations.cpp b/src/core/storage/query_engine/operators/operator_transformations.cpp index c752128a6c..3762aeb404 100644 --- a/src/core/storage/query_engine/operators/operator_transformations.cpp +++ b/src/core/storage/query_engine/operators/operator_transformations.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/operator_transformations.hpp b/src/core/storage/query_engine/operators/operator_transformations.hpp index 9858de565a..24356850ce 100644 --- a/src/core/storage/query_engine/operators/operator_transformations.hpp +++ b/src/core/storage/query_engine/operators/operator_transformations.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPERATOR_TRANSFORMATIONS_H_ #define TURI_SFRAME_QUERY_OPERATOR_TRANSFORMATIONS_H_ +#include #include #include diff --git a/src/core/storage/query_engine/operators/optonly_identity_operator.hpp b/src/core/storage/query_engine/operators/optonly_identity_operator.hpp index 9563f19206..145a0fd17a 100644 --- a/src/core/storage/query_engine/operators/optonly_identity_operator.hpp +++ b/src/core/storage/query_engine/operators/optonly_identity_operator.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_IDENTITY_NODE_HPP_ #define TURI_SFRAME_QUERY_MANAGER_IDENTITY_NODE_HPP_ +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/project.hpp b/src/core/storage/query_engine/operators/project.hpp index 3d50076213..9753c4b23c 100644 --- a/src/core/storage/query_engine/operators/project.hpp +++ b/src/core/storage/query_engine/operators/project.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_PROJECT_HPP #define TURI_SFRAME_QUERY_MANAGER_PROJECT_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/range.hpp b/src/core/storage/query_engine/operators/range.hpp index 5ff96256d8..a15a70bc16 100644 --- a/src/core/storage/query_engine/operators/range.hpp +++ b/src/core/storage/query_engine/operators/range.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_RANGE_HPP #define TURI_SFRAME_QUERY_MANAGER_RANGE_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/reduce.hpp b/src/core/storage/query_engine/operators/reduce.hpp index caba6dcbfe..5d08c52405 100644 --- a/src/core/storage/query_engine/operators/reduce.hpp +++ b/src/core/storage/query_engine/operators/reduce.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_REDUCE_HPP #define TURI_SFRAME_QUERY_MANAGER_REDUCE_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/sarray_source.hpp b/src/core/storage/query_engine/operators/sarray_source.hpp index f5d62eb9ce..785b8ca9d8 100644 --- a/src/core/storage/query_engine/operators/sarray_source.hpp +++ b/src/core/storage/query_engine/operators/sarray_source.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_SARRAY_SOURCE_HPP #define TURI_SFRAME_QUERY_MANAGER_SARRAY_SOURCE_HPP #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/sframe_source.hpp b/src/core/storage/query_engine/operators/sframe_source.hpp index d2c80df4aa..179eb049a7 100644 --- a/src/core/storage/query_engine/operators/sframe_source.hpp +++ b/src/core/storage/query_engine/operators/sframe_source.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_QUERY_MANAGER_SFRAME_SOURCE_HPP #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/ternary_operator.hpp b/src/core/storage/query_engine/operators/ternary_operator.hpp index 99410af9b0..ca3593e577 100644 --- a/src/core/storage/query_engine/operators/ternary_operator.hpp +++ b/src/core/storage/query_engine/operators/ternary_operator.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_QUERY_MANAGER_TERNARY_OPERATOR_HPP #include +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/transform.hpp b/src/core/storage/query_engine/operators/transform.hpp index 3934529ded..e5bea40d5d 100644 --- a/src/core/storage/query_engine/operators/transform.hpp +++ b/src/core/storage/query_engine/operators/transform.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_MANAGER_TRANSFORM_HPP #define TURI_SFRAME_QUERY_MANAGER_TRANSFORM_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/operators/union.hpp b/src/core/storage/query_engine/operators/union.hpp index a35f68dfb2..9615cdcb8f 100644 --- a/src/core/storage/query_engine/operators/union.hpp +++ b/src/core/storage/query_engine/operators/union.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_MANAGER_UNION_HPP #define TURI_SFRAME_QUERY_MANAGER_UNION_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/materialize_options.hpp b/src/core/storage/query_engine/planning/materialize_options.hpp index 3bd82d726f..c69f273509 100644 --- a/src/core/storage/query_engine/planning/materialize_options.hpp +++ b/src/core/storage/query_engine/planning/materialize_options.hpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace turi { class sframe_rows; diff --git a/src/core/storage/query_engine/planning/optimization_engine.cpp b/src/core/storage/query_engine/planning/optimization_engine.cpp index dd91912bea..dd4e254ce5 100644 --- a/src/core/storage/query_engine/planning/optimization_engine.cpp +++ b/src/core/storage/query_engine/planning/optimization_engine.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimization_engine.hpp b/src/core/storage/query_engine/planning/optimization_engine.hpp index 9097930142..380d078946 100644 --- a/src/core/storage/query_engine/planning/optimization_engine.hpp +++ b/src/core/storage/query_engine/planning/optimization_engine.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_ENGINE_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_ENGINE_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimization_node_info.hpp b/src/core/storage/query_engine/planning/optimization_node_info.hpp index 004683ef4a..5bdd13ebb2 100644 --- a/src/core/storage/query_engine/planning/optimization_node_info.hpp +++ b/src/core/storage/query_engine/planning/optimization_node_info.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_ENGINE_QUERY_NODE_INFO_H_ #define TURI_SFRAME_QUERY_ENGINE_QUERY_NODE_INFO_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/append_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/append_transforms.hpp index 8656524a81..2d01a64732 100644 --- a/src/core/storage/query_engine/planning/optimizations/append_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/append_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_APPEND_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_APPEND_TRANSFORMS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/general_union_project_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/general_union_project_transforms.hpp index 174a450ce0..70751a8e80 100644 --- a/src/core/storage/query_engine/planning/optimizations/general_union_project_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/general_union_project_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_GENERALIZED_UNION_PROJECT_TRANSFORMS_HPP_ #define TURI_SFRAME_QUERY_OPTIMIZATION_GENERALIZED_UNION_PROJECT_TRANSFORMS_HPP_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/logical_filter_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/logical_filter_transforms.hpp index acd0358912..e4c6cbf86e 100644 --- a/src/core/storage/query_engine/planning/optimizations/logical_filter_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/logical_filter_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_LOGICAL_FILTER_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_LOGICAL_FILTER_TRANSFORMS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/optimization_transforms.cpp b/src/core/storage/query_engine/planning/optimizations/optimization_transforms.cpp index 2d3f8d5728..49e7afc92a 100644 --- a/src/core/storage/query_engine/planning/optimizations/optimization_transforms.cpp +++ b/src/core/storage/query_engine/planning/optimizations/optimization_transforms.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/optimization_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/optimization_transforms.hpp index 160063aa25..5a3df4b493 100644 --- a/src/core/storage/query_engine/planning/optimizations/optimization_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/optimization_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_ENGINE_QUERY_OPTIMIZATION_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_ENGINE_QUERY_OPTIMIZATION_TRANSFORMS_H_ +#include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/project_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/project_transforms.hpp index 34853f4348..1093e2cbe8 100644 --- a/src/core/storage/query_engine/planning/optimizations/project_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/project_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_PROJECTION_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_PROJECTION_TRANSFORMS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/source_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/source_transforms.hpp index 718c687dfa..105437b3fb 100644 --- a/src/core/storage/query_engine/planning/optimizations/source_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/source_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_SOURCE_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_SOURCE_TRANSFORMS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/optimizations/union_transforms.hpp b/src/core/storage/query_engine/planning/optimizations/union_transforms.hpp index 4727de3623..6478c17fe6 100644 --- a/src/core/storage/query_engine/planning/optimizations/union_transforms.hpp +++ b/src/core/storage/query_engine/planning/optimizations/union_transforms.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_OPTIMIZATION_UNION_TRANSFORMS_H_ #define TURI_SFRAME_QUERY_OPTIMIZATION_UNION_TRANSFORMS_H_ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/planner.cpp b/src/core/storage/query_engine/planning/planner.cpp index 178a25365e..c8f4c86897 100644 --- a/src/core/storage/query_engine/planning/planner.cpp +++ b/src/core/storage/query_engine/planning/planner.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/planner.hpp b/src/core/storage/query_engine/planning/planner.hpp index bc48a55189..81fbc03a3a 100644 --- a/src/core/storage/query_engine/planning/planner.hpp +++ b/src/core/storage/query_engine/planning/planner.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/planning/planner_node.cpp b/src/core/storage/query_engine/planning/planner_node.cpp index 13a5a53359..b35dab85dd 100644 --- a/src/core/storage/query_engine/planning/planner_node.cpp +++ b/src/core/storage/query_engine/planning/planner_node.cpp @@ -3,3 +3,4 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include diff --git a/src/core/storage/query_engine/planning/planner_node.hpp b/src/core/storage/query_engine/planning/planner_node.hpp index 1b93c3e210..3109df1180 100644 --- a/src/core/storage/query_engine/planning/planner_node.hpp +++ b/src/core/storage/query_engine/planning/planner_node.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/query_engine/query_engine_lock.cpp b/src/core/storage/query_engine/query_engine_lock.cpp index 8f6c53e50a..b2f892c476 100644 --- a/src/core/storage/query_engine/query_engine_lock.cpp +++ b/src/core/storage/query_engine/query_engine_lock.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { namespace query_eval { diff --git a/src/core/storage/query_engine/query_engine_lock.hpp b/src/core/storage/query_engine/query_engine_lock.hpp index 86be3df5b6..4ccf2944c9 100644 --- a/src/core/storage/query_engine/query_engine_lock.hpp +++ b/src/core/storage/query_engine/query_engine_lock.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_QUERY_ENGINE_HPP #define TURI_SFRAME_QUERY_ENGINE_HPP #include +#include namespace turi { class recursive_mutex; diff --git a/src/core/storage/query_engine/util/aggregates.hpp b/src/core/storage/query_engine/util/aggregates.hpp index d88c92e3d3..623fc0b17e 100644 --- a/src/core/storage/query_engine/util/aggregates.hpp +++ b/src/core/storage/query_engine/util/aggregates.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_QUERY_ENGINE_UTIL_AGGREGATES_HPP #define TURI_SFRAME_QUERY_ENGINE_UTIL_AGGREGATES_HPP +#include #include #include #include diff --git a/src/core/storage/query_engine/util/broadcast_queue.hpp b/src/core/storage/query_engine/util/broadcast_queue.hpp index d955dcf9db..b9092bdc85 100644 --- a/src/core/storage/query_engine/util/broadcast_queue.hpp +++ b/src/core/storage/query_engine/util/broadcast_queue.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/serialization/CMakeLists.txt b/src/core/storage/serialization/CMakeLists.txt deleted file mode 100644 index c837b5aa2e..0000000000 --- a/src/core/storage/serialization/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -project(Turi) - -make_library(serialization OBJECT - SOURCES - dir_archive.cpp - REQUIRES - logger - fileio - util - random - EXTERNAL_VISIBILITY -) diff --git a/src/core/storage/serialization/basic_types.hpp b/src/core/storage/serialization/basic_types.hpp index 297721d9c1..868032ee32 100644 --- a/src/core/storage/serialization/basic_types.hpp +++ b/src/core/storage/serialization/basic_types.hpp @@ -11,6 +11,7 @@ #define ARCHIVE_BASIC_TYPES_HPP #include +#include #include #include #include diff --git a/src/core/storage/serialization/conditional_serialize.hpp b/src/core/storage/serialization/conditional_serialize.hpp index 8220e6678e..67667eee8d 100644 --- a/src/core/storage/serialization/conditional_serialize.hpp +++ b/src/core/storage/serialization/conditional_serialize.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SERIALIZATION_CONDITIONAL_SERIALIZE_HPP #define TURI_SERIALIZATION_CONDITIONAL_SERIALIZE_HPP +#include #include #include namespace turi { diff --git a/src/core/storage/serialization/dir_archive.cpp b/src/core/storage/serialization/dir_archive.cpp index ba904d3daa..88cfaef1e4 100644 --- a/src/core/storage/serialization/dir_archive.cpp +++ b/src/core/storage/serialization/dir_archive.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/serialization/dir_archive.hpp b/src/core/storage/serialization/dir_archive.hpp index 978d01ce8d..f4b8c00a7b 100644 --- a/src/core/storage/serialization/dir_archive.hpp +++ b/src/core/storage/serialization/dir_archive.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include namespace turi { diff --git a/src/core/storage/serialization/has_load.hpp b/src/core/storage/serialization/has_load.hpp index bbe95e64a4..dd1a7831bd 100644 --- a/src/core/storage/serialization/has_load.hpp +++ b/src/core/storage/serialization/has_load.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { namespace archive_detail { diff --git a/src/core/storage/serialization/has_save.hpp b/src/core/storage/serialization/has_save.hpp index 178bc21873..e70c9e3737 100644 --- a/src/core/storage/serialization/has_save.hpp +++ b/src/core/storage/serialization/has_save.hpp @@ -7,6 +7,7 @@ #define HAS_SAVE_HPP #include #include +#include namespace turi { namespace archive_detail { diff --git a/src/core/storage/serialization/iarchive.hpp b/src/core/storage/serialization/iarchive.hpp index 48e59051be..111172d6a3 100644 --- a/src/core/storage/serialization/iarchive.hpp +++ b/src/core/storage/serialization/iarchive.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #ifndef TURI_SERIALIZE_HPP +#include #include #else diff --git a/src/core/storage/serialization/is_pod.hpp b/src/core/storage/serialization/is_pod.hpp index 55201bc1bb..c6eb599f7b 100644 --- a/src/core/storage/serialization/is_pod.hpp +++ b/src/core/storage/serialization/is_pod.hpp @@ -6,6 +6,7 @@ #ifndef TURI_IS_POD_HPP #define TURI_IS_POD_HPP #include +#include namespace turi { diff --git a/src/core/storage/serialization/iterator.hpp b/src/core/storage/serialization/iterator.hpp index cbad1e64fc..63d96b881b 100644 --- a/src/core/storage/serialization/iterator.hpp +++ b/src/core/storage/serialization/iterator.hpp @@ -7,6 +7,7 @@ #define TURI_SERIALIZE_ITERATOR_HPP #include +#include #include #include diff --git a/src/core/storage/serialization/list.hpp b/src/core/storage/serialization/list.hpp index 60538ead2f..de50a2e87d 100644 --- a/src/core/storage/serialization/list.hpp +++ b/src/core/storage/serialization/list.hpp @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/src/core/storage/serialization/map.hpp b/src/core/storage/serialization/map.hpp index 4277865693..06126193de 100644 --- a/src/core/storage/serialization/map.hpp +++ b/src/core/storage/serialization/map.hpp @@ -7,6 +7,7 @@ #define TURI_SERIALIZE_MAP_HPP #include +#include #include #include #include diff --git a/src/core/storage/serialization/oarchive.hpp b/src/core/storage/serialization/oarchive.hpp index 11f4a19094..1591096902 100644 --- a/src/core/storage/serialization/oarchive.hpp +++ b/src/core/storage/serialization/oarchive.hpp @@ -5,6 +5,7 @@ */ // This file should not be included directly. use serialize.hpp #ifndef TURI_SERIALIZE_HPP +#include #include #else diff --git a/src/core/storage/serialization/rcpp_serialization.hpp b/src/core/storage/serialization/rcpp_serialization.hpp index 1272a14966..0ccddc5e40 100644 --- a/src/core/storage/serialization/rcpp_serialization.hpp +++ b/src/core/storage/serialization/rcpp_serialization.hpp @@ -8,6 +8,7 @@ #undef HAVE_VISIBILITY_ATTRIBUTE +#include #include #include // most of functions used here are included from Rinternals.h diff --git a/src/core/storage/serialization/serializable_concept.hpp b/src/core/storage/serialization/serializable_concept.hpp index dc68561e68..a7052dddc4 100644 --- a/src/core/storage/serialization/serializable_concept.hpp +++ b/src/core/storage/serialization/serializable_concept.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SERIALIZABLE #define TURI_SERIALIZABLE +#include #include #include #include diff --git a/src/core/storage/serialization/serializable_pod.hpp b/src/core/storage/serialization/serializable_pod.hpp index e1f566d287..463766d81c 100644 --- a/src/core/storage/serialization/serializable_pod.hpp +++ b/src/core/storage/serialization/serializable_pod.hpp @@ -6,6 +6,7 @@ #ifndef SERIALIZABLE_POD_HPP #define SERIALIZABLE_POD_HPP +#include #include #define SERIALIZABLE_POD(tname) \ diff --git a/src/core/storage/serialization/serialization_includes.hpp b/src/core/storage/serialization/serialization_includes.hpp index db6d6d28c2..b5e518f010 100644 --- a/src/core/storage/serialization/serialization_includes.hpp +++ b/src/core/storage/serialization/serialization_includes.hpp @@ -3,5 +3,6 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/storage/serialization/serialize.hpp b/src/core/storage/serialization/serialize.hpp index 0a8a9d2329..74979d319c 100644 --- a/src/core/storage/serialization/serialize.hpp +++ b/src/core/storage/serialization/serialize.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SERIALIZE_HPP #define TURI_SERIALIZE_HPP +#include #include #include #include diff --git a/src/core/storage/serialization/serialize_eigen.hpp b/src/core/storage/serialization/serialize_eigen.hpp index 4e6a24529a..f93c6cdf6f 100644 --- a/src/core/storage/serialization/serialize_eigen.hpp +++ b/src/core/storage/serialization/serialize_eigen.hpp @@ -31,6 +31,7 @@ #ifndef EIGEN_SERIALIZATION_HPP #define EIGEN_SERIALIZATION_HPP +#include #include #include #include diff --git a/src/core/storage/serialization/serialize_to_from_string.hpp b/src/core/storage/serialization/serialize_to_from_string.hpp index 4a62a9b45e..7c941d5899 100644 --- a/src/core/storage/serialization/serialize_to_from_string.hpp +++ b/src/core/storage/serialization/serialize_to_from_string.hpp @@ -6,6 +6,7 @@ #ifndef SERIALIZE_TO_FROM_STRING_HPP #define SERIALIZE_TO_FROM_STRING_HPP #include +#include #include namespace turi { diff --git a/src/core/storage/serialization/set.hpp b/src/core/storage/serialization/set.hpp index e20ce158dd..9037ccab8b 100644 --- a/src/core/storage/serialization/set.hpp +++ b/src/core/storage/serialization/set.hpp @@ -7,6 +7,7 @@ #define TURI_SERIALIZE_SET_HPP #include +#include #include #include #include diff --git a/src/core/storage/serialization/unordered_map.hpp b/src/core/storage/serialization/unordered_map.hpp index cb26278575..17fb671afb 100644 --- a/src/core/storage/serialization/unordered_map.hpp +++ b/src/core/storage/serialization/unordered_map.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SERIALIZE_UNORDERED_MAP_HPP #define TURI_SERIALIZE_UNORDERED_MAP_HPP +#include #include #include #include diff --git a/src/core/storage/serialization/unordered_set.hpp b/src/core/storage/serialization/unordered_set.hpp index e5c08595c7..f898125fdf 100644 --- a/src/core/storage/serialization/unordered_set.hpp +++ b/src/core/storage/serialization/unordered_set.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SERIALIZE_UNORDERED_SET_HPP #define TURI_SERIALIZE_UNORDERED_SET_HPP +#include #include #include #include diff --git a/src/core/storage/serialization/unsupported_serialize.hpp b/src/core/storage/serialization/unsupported_serialize.hpp index 6af424aacb..a03775e174 100644 --- a/src/core/storage/serialization/unsupported_serialize.hpp +++ b/src/core/storage/serialization/unsupported_serialize.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNSUPPORTED_SERIALIZE_HPP #define TURI_UNSUPPORTED_SERIALIZE_HPP +#include #include #include #include diff --git a/src/core/storage/serialization/vector.hpp b/src/core/storage/serialization/vector.hpp index 6d7560d080..7a0f16df47 100644 --- a/src/core/storage/serialization/vector.hpp +++ b/src/core/storage/serialization/vector.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SERIALIZE_VECTOR_HPP #define TURI_SERIALIZE_VECTOR_HPP #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/CMakeLists.txt b/src/core/storage/sframe_data/CMakeLists.txt deleted file mode 100644 index 81753e4639..0000000000 --- a/src/core/storage/sframe_data/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -project(Turi) - -make_library(sframe OBJECT - SOURCES - dataframe.cpp - sarray_index_file.cpp - sframe_constants.cpp - sframe_config.cpp - sframe.cpp - sframe_reader.cpp - sframe_index_file.cpp - parallel_csv_parser.cpp - sframe_io.cpp - shuffle.cpp - csv_line_tokenizer.cpp - sarray_v2_block_manager.cpp - sarray_v2_type_encoding.cpp - sarray_v2_block_writer.cpp - sarray_sorted_buffer.cpp - sarray_v2_encoded_block.cpp - groupby.cpp - groupby_aggregate.cpp - groupby_aggregate_impl.cpp - group_aggregate_value.cpp - sframe_iterators.cpp - csv_writer.cpp - join.cpp - join_impl.cpp - unfair_lock.cpp - sframe_rows.cpp - testing_utils.cpp - sframe_saving.cpp - sframe_saving_impl.cpp - sframe_compact.cpp - rolling_aggregate.cpp - REQUIRES - random flexible_type fileio parallel lz4 - cancel_serverside_ops serialization libjson globals - EXTERNAL_VISIBILITY -) diff --git a/src/core/storage/sframe_data/algorithm.hpp b/src/core/storage/sframe_data/algorithm.hpp index 1495a54a23..de6b018c7d 100644 --- a/src/core/storage/sframe_data/algorithm.hpp +++ b/src/core/storage/sframe_data/algorithm.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/comma_escape_string.hpp b/src/core/storage/sframe_data/comma_escape_string.hpp index e8a800e66d..0bc0458569 100644 --- a/src/core/storage/sframe_data/comma_escape_string.hpp +++ b/src/core/storage/sframe_data/comma_escape_string.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/core/storage/sframe_data/csv_line_tokenizer.cpp b/src/core/storage/sframe_data/csv_line_tokenizer.cpp index ea8f390087..c2aeb4fca1 100644 --- a/src/core/storage/sframe_data/csv_line_tokenizer.cpp +++ b/src/core/storage/sframe_data/csv_line_tokenizer.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/csv_line_tokenizer.hpp b/src/core/storage/sframe_data/csv_line_tokenizer.hpp index bc2e366fca..bd7b6c0f7c 100644 --- a/src/core/storage/sframe_data/csv_line_tokenizer.hpp +++ b/src/core/storage/sframe_data/csv_line_tokenizer.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/csv_writer.cpp b/src/core/storage/sframe_data/csv_writer.cpp index 8323e09fc1..5a67eb95ee 100644 --- a/src/core/storage/sframe_data/csv_writer.cpp +++ b/src/core/storage/sframe_data/csv_writer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/csv_writer.hpp b/src/core/storage/sframe_data/csv_writer.hpp index 9c69ac9179..4f3dea6e08 100644 --- a/src/core/storage/sframe_data/csv_writer.hpp +++ b/src/core/storage/sframe_data/csv_writer.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/dataframe.cpp b/src/core/storage/sframe_data/dataframe.cpp index 78ca9c03d9..6d8f295f79 100644 --- a/src/core/storage/sframe_data/dataframe.cpp +++ b/src/core/storage/sframe_data/dataframe.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/dataframe.hpp b/src/core/storage/sframe_data/dataframe.hpp index 36705bd434..9449fdd221 100644 --- a/src/core/storage/sframe_data/dataframe.hpp +++ b/src/core/storage/sframe_data/dataframe.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_DATAFRAME_HPP #include #include +#include #include #include diff --git a/src/core/storage/sframe_data/group_aggregate_value.cpp b/src/core/storage/sframe_data/group_aggregate_value.cpp index 147e96d90b..48f28e3f8f 100644 --- a/src/core/storage/sframe_data/group_aggregate_value.cpp +++ b/src/core/storage/sframe_data/group_aggregate_value.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/group_aggregate_value.hpp b/src/core/storage/sframe_data/group_aggregate_value.hpp index 156754c122..fe34417ee6 100644 --- a/src/core/storage/sframe_data/group_aggregate_value.hpp +++ b/src/core/storage/sframe_data/group_aggregate_value.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_GROUP_AGGREGATE_VALUE_HPP #define TURI_SFRAME_GROUP_AGGREGATE_VALUE_HPP +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/groupby.cpp b/src/core/storage/sframe_data/groupby.cpp index 59bfc5cd8d..63196a6861 100644 --- a/src/core/storage/sframe_data/groupby.cpp +++ b/src/core/storage/sframe_data/groupby.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/groupby.hpp b/src/core/storage/sframe_data/groupby.hpp index 8c696e1367..f6f8805b86 100644 --- a/src/core/storage/sframe_data/groupby.hpp +++ b/src/core/storage/sframe_data/groupby.hpp @@ -6,11 +6,12 @@ #ifndef TURI_SFRAME_GROUPBY_HPP #define TURI_SFRAME_GROUPBY_HPP +#include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/storage/sframe_data/groupby_aggregate.cpp b/src/core/storage/sframe_data/groupby_aggregate.cpp index 0265d66d27..3fe3aabe7f 100644 --- a/src/core/storage/sframe_data/groupby_aggregate.cpp +++ b/src/core/storage/sframe_data/groupby_aggregate.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/groupby_aggregate.hpp b/src/core/storage/sframe_data/groupby_aggregate.hpp index 35b647f371..510ce261c1 100644 --- a/src/core/storage/sframe_data/groupby_aggregate.hpp +++ b/src/core/storage/sframe_data/groupby_aggregate.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/groupby_aggregate_impl.cpp b/src/core/storage/sframe_data/groupby_aggregate_impl.cpp index 970d0bc072..e04b81a916 100644 --- a/src/core/storage/sframe_data/groupby_aggregate_impl.cpp +++ b/src/core/storage/sframe_data/groupby_aggregate_impl.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/groupby_aggregate_impl.hpp b/src/core/storage/sframe_data/groupby_aggregate_impl.hpp index 88ff55d308..9444d63e75 100644 --- a/src/core/storage/sframe_data/groupby_aggregate_impl.hpp +++ b/src/core/storage/sframe_data/groupby_aggregate_impl.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/groupby_aggregate_operators.hpp b/src/core/storage/sframe_data/groupby_aggregate_operators.hpp index 417060d245..b18f0eb617 100644 --- a/src/core/storage/sframe_data/groupby_aggregate_operators.hpp +++ b/src/core/storage/sframe_data/groupby_aggregate_operators.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_GROUPBY_AGGREGATE_OPERATORS_HPP #define TURI_SFRAME_GROUPBY_AGGREGATE_OPERATORS_HPP +#include #include #include namespace turi { diff --git a/src/core/storage/sframe_data/integer_pack.hpp b/src/core/storage/sframe_data/integer_pack.hpp index f0e1017ec7..7c326c3177 100644 --- a/src/core/storage/sframe_data/integer_pack.hpp +++ b/src/core/storage/sframe_data/integer_pack.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/integer_pack_impl.hpp b/src/core/storage/sframe_data/integer_pack_impl.hpp index db2b94ad24..405e5a0c50 100644 --- a/src/core/storage/sframe_data/integer_pack_impl.hpp +++ b/src/core/storage/sframe_data/integer_pack_impl.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_INTEGER_PACK_IMPL_HPP +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/is_sarray_like.hpp b/src/core/storage/sframe_data/is_sarray_like.hpp index 941d9888c4..b3d0bcf8d5 100644 --- a/src/core/storage/sframe_data/is_sarray_like.hpp +++ b/src/core/storage/sframe_data/is_sarray_like.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SFRAME_IS_SARRAY_LIKE_HPP #define TURI_UNITY_SFRAME_IS_SARRAY_LIKE_HPP #include +#include #include #include namespace turi { diff --git a/src/core/storage/sframe_data/is_siterable.hpp b/src/core/storage/sframe_data/is_siterable.hpp index 5d9456394b..6b5195bae6 100644 --- a/src/core/storage/sframe_data/is_siterable.hpp +++ b/src/core/storage/sframe_data/is_siterable.hpp @@ -8,6 +8,7 @@ #include #include +#include #include namespace turi { namespace sframe_impl { diff --git a/src/core/storage/sframe_data/is_swriter_base.hpp b/src/core/storage/sframe_data/is_swriter_base.hpp index fceb219a66..882cc29492 100644 --- a/src/core/storage/sframe_data/is_swriter_base.hpp +++ b/src/core/storage/sframe_data/is_swriter_base.hpp @@ -9,6 +9,7 @@ #include #include +#include #include namespace turi { namespace sframe_impl { diff --git a/src/core/storage/sframe_data/join.cpp b/src/core/storage/sframe_data/join.cpp index 48a466630b..8266d80a83 100644 --- a/src/core/storage/sframe_data/join.cpp +++ b/src/core/storage/sframe_data/join.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/join.hpp b/src/core/storage/sframe_data/join.hpp index 54401f29bf..dfcc66c076 100644 --- a/src/core/storage/sframe_data/join.hpp +++ b/src/core/storage/sframe_data/join.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/join_impl.cpp b/src/core/storage/sframe_data/join_impl.cpp index 86cba25670..ee81014dcd 100644 --- a/src/core/storage/sframe_data/join_impl.cpp +++ b/src/core/storage/sframe_data/join_impl.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/join_impl.hpp b/src/core/storage/sframe_data/join_impl.hpp index d1b7ff583c..c01d5674e8 100644 --- a/src/core/storage/sframe_data/join_impl.hpp +++ b/src/core/storage/sframe_data/join_impl.hpp @@ -7,6 +7,7 @@ #include #include +#include #include //TODO: What happens if a join key (or part of one) is NULL? diff --git a/src/core/storage/sframe_data/output_iterator.hpp b/src/core/storage/sframe_data/output_iterator.hpp index 13efd54a33..427fbcefbd 100644 --- a/src/core/storage/sframe_data/output_iterator.hpp +++ b/src/core/storage/sframe_data/output_iterator.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_OUTPUT_ITERATOR_HPP #define TURI_SFRAME_OUTPUT_ITERATOR_HPP #include +#include namespace turi { class sframe_rows; diff --git a/src/core/storage/sframe_data/parallel_csv_parser.cpp b/src/core/storage/sframe_data/parallel_csv_parser.cpp index 2cabafdf14..df9573324e 100644 --- a/src/core/storage/sframe_data/parallel_csv_parser.cpp +++ b/src/core/storage/sframe_data/parallel_csv_parser.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/parallel_csv_parser.hpp b/src/core/storage/sframe_data/parallel_csv_parser.hpp index e538c72314..2efd626bcf 100644 --- a/src/core/storage/sframe_data/parallel_csv_parser.hpp +++ b/src/core/storage/sframe_data/parallel_csv_parser.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/rolling_aggregate.cpp b/src/core/storage/sframe_data/rolling_aggregate.cpp index 6407c8a98e..7700e9a7e8 100644 --- a/src/core/storage/sframe_data/rolling_aggregate.cpp +++ b/src/core/storage/sframe_data/rolling_aggregate.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/rolling_aggregate.hpp b/src/core/storage/sframe_data/rolling_aggregate.hpp index 5f332a4b38..da670c7638 100644 --- a/src/core/storage/sframe_data/rolling_aggregate.hpp +++ b/src/core/storage/sframe_data/rolling_aggregate.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_ROLLING_AGGREGATE_HPP #define TURI_SFRAME_ROLLING_AGGREGATE_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray.hpp b/src/core/storage/sframe_data/sarray.hpp index 24f19f1e97..0e6de91191 100644 --- a/src/core/storage/sframe_data/sarray.hpp +++ b/src/core/storage/sframe_data/sarray.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_file_format_interface.hpp b/src/core/storage/sframe_data/sarray_file_format_interface.hpp index fae4572d6c..97ddd1ed67 100644 --- a/src/core/storage/sframe_data/sarray_file_format_interface.hpp +++ b/src/core/storage/sframe_data/sarray_file_format_interface.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_file_format_v2.hpp b/src/core/storage/sframe_data/sarray_file_format_v2.hpp index c1817b2a03..69719d66df 100644 --- a/src/core/storage/sframe_data/sarray_file_format_v2.hpp +++ b/src/core/storage/sframe_data/sarray_file_format_v2.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_index_file.cpp b/src/core/storage/sframe_data/sarray_index_file.cpp index 59db181a51..5154f618ff 100644 --- a/src/core/storage/sframe_data/sarray_index_file.cpp +++ b/src/core/storage/sframe_data/sarray_index_file.cpp @@ -5,6 +5,7 @@ */ #define BOOST_SPIRIT_THREADSAFE +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_index_file.hpp b/src/core/storage/sframe_data/sarray_index_file.hpp index d003e6fb9f..7ad982104c 100644 --- a/src/core/storage/sframe_data/sarray_index_file.hpp +++ b/src/core/storage/sframe_data/sarray_index_file.hpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace turi { class oarchive; class iarchive; diff --git a/src/core/storage/sframe_data/sarray_iterators.hpp b/src/core/storage/sframe_data/sarray_iterators.hpp index 16774d4c6e..6d0a61ad3c 100644 --- a/src/core/storage/sframe_data/sarray_iterators.hpp +++ b/src/core/storage/sframe_data/sarray_iterators.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/storage/sframe_data/sarray_reader.hpp b/src/core/storage/sframe_data/sarray_reader.hpp index e9c9549578..877356b5b9 100644 --- a/src/core/storage/sframe_data/sarray_reader.hpp +++ b/src/core/storage/sframe_data/sarray_reader.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_reader_buffer.hpp b/src/core/storage/sframe_data/sarray_reader_buffer.hpp index 7cfa732105..bbf9314d42 100644 --- a/src/core/storage/sframe_data/sarray_reader_buffer.hpp +++ b/src/core/storage/sframe_data/sarray_reader_buffer.hpp @@ -7,6 +7,7 @@ #define TURI_SARRAY_READER_BUFFER #include #include +#include #include namespace turi { template diff --git a/src/core/storage/sframe_data/sarray_saving.hpp b/src/core/storage/sframe_data/sarray_saving.hpp index 1d203d84a1..64f163d146 100644 --- a/src/core/storage/sframe_data/sarray_saving.hpp +++ b/src/core/storage/sframe_data/sarray_saving.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SARRAY_SAVING_HPP #define TURI_SARRAY_SAVING_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_sorted_buffer.cpp b/src/core/storage/sframe_data/sarray_sorted_buffer.cpp index aedd0a1edc..22f1849db1 100644 --- a/src/core/storage/sframe_data/sarray_sorted_buffer.cpp +++ b/src/core/storage/sframe_data/sarray_sorted_buffer.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/sarray_sorted_buffer.hpp b/src/core/storage/sframe_data/sarray_sorted_buffer.hpp index 5aaf3b6336..f2d444d453 100644 --- a/src/core/storage/sframe_data/sarray_sorted_buffer.hpp +++ b/src/core/storage/sframe_data/sarray_sorted_buffer.hpp @@ -6,12 +6,13 @@ #ifndef TURI_SFRAME_SARRAY_SORTED_BUFFER_HPP #define TURI_SFRAME_SARRAY_SORTED_BUFFER_HPP -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/storage/sframe_data/sarray_v2_block_manager.cpp b/src/core/storage/sframe_data/sarray_v2_block_manager.cpp index d1b4486cc4..7cc045e6b0 100644 --- a/src/core/storage/sframe_data/sarray_v2_block_manager.cpp +++ b/src/core/storage/sframe_data/sarray_v2_block_manager.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ extern "C" { +#include #include } #include diff --git a/src/core/storage/sframe_data/sarray_v2_block_manager.hpp b/src/core/storage/sframe_data/sarray_v2_block_manager.hpp index c38d32fa1e..223c3efc42 100644 --- a/src/core/storage/sframe_data/sarray_v2_block_manager.hpp +++ b/src/core/storage/sframe_data/sarray_v2_block_manager.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_SARRAY_V2_BLOCK_MANAGER_HPP #define TURI_SFRAME_SARRAY_V2_BLOCK_MANAGER_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_block_types.hpp b/src/core/storage/sframe_data/sarray_v2_block_types.hpp index ab92d46dc5..ee065c6d69 100644 --- a/src/core/storage/sframe_data/sarray_v2_block_types.hpp +++ b/src/core/storage/sframe_data/sarray_v2_block_types.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_SARRAY_V2_BLOCK_TYPES_HPP #define TURI_SFRAME_SARRAY_V2_BLOCK_TYPES_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_block_writer.cpp b/src/core/storage/sframe_data/sarray_v2_block_writer.cpp index 765568c7d2..57b0d135a1 100644 --- a/src/core/storage/sframe_data/sarray_v2_block_writer.cpp +++ b/src/core/storage/sframe_data/sarray_v2_block_writer.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ extern "C" { +#include #include } #include diff --git a/src/core/storage/sframe_data/sarray_v2_block_writer.hpp b/src/core/storage/sframe_data/sarray_v2_block_writer.hpp index 6d7c505a59..faee79746c 100644 --- a/src/core/storage/sframe_data/sarray_v2_block_writer.hpp +++ b/src/core/storage/sframe_data/sarray_v2_block_writer.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_SARRAY_V2_BLOCK_WRITER_HPP #define TURI_SFRAME_SARRAY_V2_BLOCK_WRITER_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_encoded_block.cpp b/src/core/storage/sframe_data/sarray_v2_encoded_block.cpp index 775fac6b7e..1ad29d5da3 100644 --- a/src/core/storage/sframe_data/sarray_v2_encoded_block.cpp +++ b/src/core/storage/sframe_data/sarray_v2_encoded_block.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_encoded_block.hpp b/src/core/storage/sframe_data/sarray_v2_encoded_block.hpp index 8b49a9b1bf..58b410b600 100644 --- a/src/core/storage/sframe_data/sarray_v2_encoded_block.hpp +++ b/src/core/storage/sframe_data/sarray_v2_encoded_block.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_ENCODED_BLOCK_HPP #define TURI_SFRAME_ENCODED_BLOCK_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_type_encoding.cpp b/src/core/storage/sframe_data/sarray_v2_type_encoding.cpp index 44022afc23..70fb086895 100644 --- a/src/core/storage/sframe_data/sarray_v2_type_encoding.cpp +++ b/src/core/storage/sframe_data/sarray_v2_type_encoding.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sarray_v2_type_encoding.hpp b/src/core/storage/sframe_data/sarray_v2_type_encoding.hpp index 519bf5b939..138c8d138e 100644 --- a/src/core/storage/sframe_data/sarray_v2_type_encoding.hpp +++ b/src/core/storage/sframe_data/sarray_v2_type_encoding.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_SARRAY_V2_TYPE_ENCODING_HPP #define TURI_SFRAME_SARRAY_V2_TYPE_ENCODING_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe.cpp b/src/core/storage/sframe_data/sframe.cpp index b024b0fb0d..d5ab8a3128 100644 --- a/src/core/storage/sframe_data/sframe.cpp +++ b/src/core/storage/sframe_data/sframe.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe.hpp b/src/core/storage/sframe_data/sframe.hpp index e60e72fec7..817d255a35 100644 --- a/src/core/storage/sframe_data/sframe.hpp +++ b/src/core/storage/sframe_data/sframe.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_compact.cpp b/src/core/storage/sframe_data/sframe_compact.cpp index 9081cfe48f..dbbec56b7b 100644 --- a/src/core/storage/sframe_data/sframe_compact.cpp +++ b/src/core/storage/sframe_data/sframe_compact.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include namespace turi { diff --git a/src/core/storage/sframe_data/sframe_compact.hpp b/src/core/storage/sframe_data/sframe_compact.hpp index afef4fdca0..5b3cb523f2 100644 --- a/src/core/storage/sframe_data/sframe_compact.hpp +++ b/src/core/storage/sframe_data/sframe_compact.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_COMPACT_HPP #include #include +#include namespace turi { class sframe; diff --git a/src/core/storage/sframe_data/sframe_compact_impl.hpp b/src/core/storage/sframe_data/sframe_compact_impl.hpp index d5b0b15904..b3502a0aa7 100644 --- a/src/core/storage/sframe_data/sframe_compact_impl.hpp +++ b/src/core/storage/sframe_data/sframe_compact_impl.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_COMPACT_IMPL_HPP #include #include +#include #include namespace turi { namespace { diff --git a/src/core/storage/sframe_data/sframe_config.cpp b/src/core/storage/sframe_data/sframe_config.cpp index b35b48e2a3..dec734350a 100644 --- a/src/core/storage/sframe_data/sframe_config.cpp +++ b/src/core/storage/sframe_data/sframe_config.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_config.hpp b/src/core/storage/sframe_data/sframe_config.hpp index 7c1f129bf3..dc5de1abb7 100644 --- a/src/core/storage/sframe_data/sframe_config.hpp +++ b/src/core/storage/sframe_data/sframe_config.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_CONFIG_HPP #define TURI_SFRAME_CONFIG_HPP #include +#include namespace turi { diff --git a/src/core/storage/sframe_data/sframe_constants.cpp b/src/core/storage/sframe_data/sframe_constants.cpp index 513597e9e7..7328f9bb8a 100644 --- a/src/core/storage/sframe_data/sframe_constants.cpp +++ b/src/core/storage/sframe_data/sframe_constants.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_constants.hpp b/src/core/storage/sframe_data/sframe_constants.hpp index 2c5e6aec3c..3eb03e7c58 100644 --- a/src/core/storage/sframe_data/sframe_constants.hpp +++ b/src/core/storage/sframe_data/sframe_constants.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_CONSTANTS_HPP #include #include +#include namespace turi { diff --git a/src/core/storage/sframe_data/sframe_index_file.cpp b/src/core/storage/sframe_data/sframe_index_file.cpp index be8c26c04c..61e80f2f1f 100644 --- a/src/core/storage/sframe_data/sframe_index_file.cpp +++ b/src/core/storage/sframe_data/sframe_index_file.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #define BOOST_SPIRIT_THREADSAFE +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_index_file.hpp b/src/core/storage/sframe_data/sframe_index_file.hpp index df1bcc34e7..45a2ac4a26 100644 --- a/src/core/storage/sframe_data/sframe_index_file.hpp +++ b/src/core/storage/sframe_data/sframe_index_file.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include namespace turi { diff --git a/src/core/storage/sframe_data/sframe_io.cpp b/src/core/storage/sframe_data/sframe_io.cpp index 703813729e..269ef387ac 100644 --- a/src/core/storage/sframe_data/sframe_io.cpp +++ b/src/core/storage/sframe_data/sframe_io.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include +#include +#include +#include +#include namespace turi{ diff --git a/src/core/storage/sframe_data/sframe_io.hpp b/src/core/storage/sframe_data/sframe_io.hpp index 25f1674d14..f9c7d67cca 100644 --- a/src/core/storage/sframe_data/sframe_io.hpp +++ b/src/core/storage/sframe_data/sframe_io.hpp @@ -6,8 +6,9 @@ #ifndef TURI_SFRAME_IO_HPP #define TURI_SFRAME_IO_HPP -#include -#include +#include +#include +#include class JSONNode; diff --git a/src/core/storage/sframe_data/sframe_iterators.cpp b/src/core/storage/sframe_data/sframe_iterators.cpp index f0d2d14818..2c0cda1895 100644 --- a/src/core/storage/sframe_data/sframe_iterators.cpp +++ b/src/core/storage/sframe_data/sframe_iterators.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/storage/sframe_data/sframe_iterators.hpp b/src/core/storage/sframe_data/sframe_iterators.hpp index 48d04d8f31..6cfb3f5cdc 100644 --- a/src/core/storage/sframe_data/sframe_iterators.hpp +++ b/src/core/storage/sframe_data/sframe_iterators.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_ITERATORS_H_ #include +#include #include #include diff --git a/src/core/storage/sframe_data/sframe_reader.cpp b/src/core/storage/sframe_data/sframe_reader.cpp index 793fabd9ac..35167ba19f 100644 --- a/src/core/storage/sframe_data/sframe_reader.cpp +++ b/src/core/storage/sframe_data/sframe_reader.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_reader.hpp b/src/core/storage/sframe_data/sframe_reader.hpp index 7cb672d3aa..e44a86c222 100644 --- a/src/core/storage/sframe_data/sframe_reader.hpp +++ b/src/core/storage/sframe_data/sframe_reader.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_reader_buffer.hpp b/src/core/storage/sframe_data/sframe_reader_buffer.hpp index a65169aada..4d9e521592 100644 --- a/src/core/storage/sframe_data/sframe_reader_buffer.hpp +++ b/src/core/storage/sframe_data/sframe_reader_buffer.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_READER_BUFFER #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_rows.cpp b/src/core/storage/sframe_data/sframe_rows.cpp index b386431ab5..d8d1312971 100644 --- a/src/core/storage/sframe_data/sframe_rows.cpp +++ b/src/core/storage/sframe_data/sframe_rows.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_rows.hpp b/src/core/storage/sframe_data/sframe_rows.hpp index 072f31e60f..9ba033e027 100644 --- a/src/core/storage/sframe_data/sframe_rows.hpp +++ b/src/core/storage/sframe_data/sframe_rows.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_sframe_rows_HPP #include #include +#include #include namespace turi { class oarchive; diff --git a/src/core/storage/sframe_data/sframe_saving.cpp b/src/core/storage/sframe_data/sframe_saving.cpp index 16c0b6633b..6458d439a7 100644 --- a/src/core/storage/sframe_data/sframe_saving.cpp +++ b/src/core/storage/sframe_data/sframe_saving.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_saving.hpp b/src/core/storage/sframe_data/sframe_saving.hpp index 9d5c740a87..6145ff0676 100644 --- a/src/core/storage/sframe_data/sframe_saving.hpp +++ b/src/core/storage/sframe_data/sframe_saving.hpp @@ -62,3 +62,4 @@ void sframe_save_weak_reference(const sframe& sf, }; // naemspace turicreate #endif +#include diff --git a/src/core/storage/sframe_data/sframe_saving_impl.cpp b/src/core/storage/sframe_data/sframe_saving_impl.cpp index a10b758bd5..41375aac7d 100644 --- a/src/core/storage/sframe_data/sframe_saving_impl.cpp +++ b/src/core/storage/sframe_data/sframe_saving_impl.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/sframe_saving_impl.hpp b/src/core/storage/sframe_data/sframe_saving_impl.hpp index b9902b63c5..e899a8a3a6 100644 --- a/src/core/storage/sframe_data/sframe_saving_impl.hpp +++ b/src/core/storage/sframe_data/sframe_saving_impl.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SFRAME_SAVING_IMPL_HPP #define TURI_SFRAME_SAVING_IMPL_HPP +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/shuffle.cpp b/src/core/storage/sframe_data/shuffle.cpp index a089b3997f..d3a3feafca 100644 --- a/src/core/storage/sframe_data/shuffle.cpp +++ b/src/core/storage/sframe_data/shuffle.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/storage/sframe_data/shuffle.hpp b/src/core/storage/sframe_data/shuffle.hpp index f1bff194cb..88510d9676 100644 --- a/src/core/storage/sframe_data/shuffle.hpp +++ b/src/core/storage/sframe_data/shuffle.hpp @@ -7,6 +7,7 @@ #define TURI_SFRAME_SHUFFLE_HPP #include +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/siterable.hpp b/src/core/storage/sframe_data/siterable.hpp index 01426194c5..7e887db960 100644 --- a/src/core/storage/sframe_data/siterable.hpp +++ b/src/core/storage/sframe_data/siterable.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_SITERABLE_HPP #include #include +#include namespace turi { /** diff --git a/src/core/storage/sframe_data/swriter_base.hpp b/src/core/storage/sframe_data/swriter_base.hpp index f86a06da9d..2cddc3e102 100644 --- a/src/core/storage/sframe_data/swriter_base.hpp +++ b/src/core/storage/sframe_data/swriter_base.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_SWRITER_BASE_HPP #define TURI_UNITY_SWRITER_BASE_HPP +#include #include #include namespace turi { diff --git a/src/core/storage/sframe_data/testing_utils.cpp b/src/core/storage/sframe_data/testing_utils.cpp index da25f7ea84..9e2535b938 100644 --- a/src/core/storage/sframe_data/testing_utils.cpp +++ b/src/core/storage/sframe_data/testing_utils.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/storage/sframe_data/testing_utils.hpp b/src/core/storage/sframe_data/testing_utils.hpp index a0a32c3317..55122b9ab2 100644 --- a/src/core/storage/sframe_data/testing_utils.hpp +++ b/src/core/storage/sframe_data/testing_utils.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SFRAME_TESTING_UTILS_H_ #define TURI_SFRAME_TESTING_UTILS_H_ +#include #include #include #include diff --git a/src/core/storage/sframe_data/unfair_lock.cpp b/src/core/storage/sframe_data/unfair_lock.cpp index a27d82289a..76d57daa17 100644 --- a/src/core/storage/sframe_data/unfair_lock.cpp +++ b/src/core/storage/sframe_data/unfair_lock.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_data/unfair_lock.hpp b/src/core/storage/sframe_data/unfair_lock.hpp index 3a5ee4966f..8f93f5dc46 100644 --- a/src/core/storage/sframe_data/unfair_lock.hpp +++ b/src/core/storage/sframe_data/unfair_lock.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/storage/sframe_interface/unity_sarray.cpp b/src/core/storage/sframe_interface/unity_sarray.cpp index 5e05e8e5eb..afdfc53cb2 100644 --- a/src/core/storage/sframe_interface/unity_sarray.cpp +++ b/src/core/storage/sframe_interface/unity_sarray.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sarray.hpp b/src/core/storage/sframe_interface/unity_sarray.hpp index 0645ca8275..d469c7b0cd 100644 --- a/src/core/storage/sframe_interface/unity_sarray.hpp +++ b/src/core/storage/sframe_interface/unity_sarray.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sarray_binary_operations.cpp b/src/core/storage/sframe_interface/unity_sarray_binary_operations.cpp index 10c0ed33f6..58126215c2 100644 --- a/src/core/storage/sframe_interface/unity_sarray_binary_operations.cpp +++ b/src/core/storage/sframe_interface/unity_sarray_binary_operations.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sarray_binary_operations.hpp b/src/core/storage/sframe_interface/unity_sarray_binary_operations.hpp index 7451b221cc..0c7b2f1eb7 100644 --- a/src/core/storage/sframe_interface/unity_sarray_binary_operations.hpp +++ b/src/core/storage/sframe_interface/unity_sarray_binary_operations.hpp @@ -7,6 +7,7 @@ #define UNITY_LIB_UNITY_SARRAY_BINARY_OPERATIONS_HPP #include #include +#include #include namespace turi { namespace unity_sarray_binary_operations { diff --git a/src/core/storage/sframe_interface/unity_sarray_builder.cpp b/src/core/storage/sframe_interface/unity_sarray_builder.cpp index bab94050e5..b91c1b3c7f 100644 --- a/src/core/storage/sframe_interface/unity_sarray_builder.cpp +++ b/src/core/storage/sframe_interface/unity_sarray_builder.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/storage/sframe_interface/unity_sarray_builder.hpp b/src/core/storage/sframe_interface/unity_sarray_builder.hpp index f68964d6ec..734a4315fb 100644 --- a/src/core/storage/sframe_interface/unity_sarray_builder.hpp +++ b/src/core/storage/sframe_interface/unity_sarray_builder.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_SARRAY_BUILDER_HPP #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sframe.cpp b/src/core/storage/sframe_interface/unity_sframe.cpp index b299515864..24b464d2a8 100644 --- a/src/core/storage/sframe_interface/unity_sframe.cpp +++ b/src/core/storage/sframe_interface/unity_sframe.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sframe.hpp b/src/core/storage/sframe_interface/unity_sframe.hpp index f8e29646a9..6b9ac41a32 100644 --- a/src/core/storage/sframe_interface/unity_sframe.hpp +++ b/src/core/storage/sframe_interface/unity_sframe.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sframe_builder.cpp b/src/core/storage/sframe_interface/unity_sframe_builder.cpp index e9afd1288d..1435393c0f 100644 --- a/src/core/storage/sframe_interface/unity_sframe_builder.cpp +++ b/src/core/storage/sframe_interface/unity_sframe_builder.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/storage/sframe_interface/unity_sframe_builder.hpp b/src/core/storage/sframe_interface/unity_sframe_builder.hpp index 254d03cfc2..c0a044587b 100644 --- a/src/core/storage/sframe_interface/unity_sframe_builder.hpp +++ b/src/core/storage/sframe_interface/unity_sframe_builder.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sgraph.cpp b/src/core/storage/sframe_interface/unity_sgraph.cpp index 093ff5fb42..69ef8f1936 100644 --- a/src/core/storage/sframe_interface/unity_sgraph.cpp +++ b/src/core/storage/sframe_interface/unity_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sgraph.hpp b/src/core/storage/sframe_interface/unity_sgraph.hpp index 5f2268d295..5b44be95f8 100644 --- a/src/core/storage/sframe_interface/unity_sgraph.hpp +++ b/src/core/storage/sframe_interface/unity_sgraph.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_SGRAPH_HPP #define TURI_UNITY_SGRAPH_HPP +#include #include #include #include diff --git a/src/core/storage/sframe_interface/unity_sgraph_lazy_ops.hpp b/src/core/storage/sframe_interface/unity_sgraph_lazy_ops.hpp index 6e9f874942..88d4c2eab2 100644 --- a/src/core/storage/sframe_interface/unity_sgraph_lazy_ops.hpp +++ b/src/core/storage/sframe_interface/unity_sgraph_lazy_ops.hpp @@ -5,8 +5,9 @@ */ #ifndef UNITY_SGRAPH_LAZY_OPS_HPP #define UNITY_SGRAPH_LAZY_OPS_HPP +#include #include -#include +#include /**************************************************************************/ /* */ diff --git a/src/core/storage/sgraph_data/CMakeLists.txt b/src/core/storage/sgraph_data/CMakeLists.txt deleted file mode 100644 index 22d1562341..0000000000 --- a/src/core/storage/sgraph_data/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -project(Turi) - -make_library(sgraph OBJECT - SOURCES - sgraph.cpp - sgraph_triple_apply.cpp - sgraph_fast_triple_apply.cpp - sgraph_io.cpp - sgraph_constants.cpp - REQUIRES - flexible_type sframe pylambda sparsehash - EXTERNAL_VISIBILITY -) diff --git a/src/core/storage/sgraph_data/hilbert_curve.hpp b/src/core/storage/sgraph_data/hilbert_curve.hpp index b72bb35bb6..964a3e2364 100644 --- a/src/core/storage/sgraph_data/hilbert_curve.hpp +++ b/src/core/storage/sgraph_data/hilbert_curve.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/src/core/storage/sgraph_data/hilbert_parallel_for.hpp b/src/core/storage/sgraph_data/hilbert_parallel_for.hpp index 502a0cfe4b..3fccc21b3d 100644 --- a/src/core/storage/sgraph_data/hilbert_parallel_for.hpp +++ b/src/core/storage/sgraph_data/hilbert_parallel_for.hpp @@ -7,6 +7,7 @@ #define TURI_SGRAPH_HILBERT_PARALLE_FOR_HPP #include #include +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph.cpp b/src/core/storage/sgraph_data/sgraph.cpp index 5b36e58bb8..88d0709dbc 100644 --- a/src/core/storage/sgraph_data/sgraph.cpp +++ b/src/core/storage/sgraph_data/sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph.hpp b/src/core/storage/sgraph_data/sgraph.hpp index 8480d881a8..3547146d8a 100644 --- a/src/core/storage/sgraph_data/sgraph.hpp +++ b/src/core/storage/sgraph_data/sgraph.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SGRAPH_SGRAPH_HPP #define TURI_SGRAPH_SGRAPH_HPP #include +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_compute.hpp b/src/core/storage/sgraph_data/sgraph_compute.hpp index df441611de..6abc8ee204 100644 --- a/src/core/storage/sgraph_data/sgraph_compute.hpp +++ b/src/core/storage/sgraph_data/sgraph_compute.hpp @@ -7,6 +7,7 @@ #define TURI_SGRAPH_SGRAPH_COMPUTE_HPP +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_compute_vertex_block.hpp b/src/core/storage/sgraph_data/sgraph_compute_vertex_block.hpp index 988f8488d7..c43f914930 100644 --- a/src/core/storage/sgraph_data/sgraph_compute_vertex_block.hpp +++ b/src/core/storage/sgraph_data/sgraph_compute_vertex_block.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_constants.cpp b/src/core/storage/sgraph_data/sgraph_constants.cpp index d376941dea..f2b08d1ef2 100644 --- a/src/core/storage/sgraph_data/sgraph_constants.cpp +++ b/src/core/storage/sgraph_data/sgraph_constants.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_constants.hpp b/src/core/storage/sgraph_data/sgraph_constants.hpp index 8890556b9a..27dbaad00a 100644 --- a/src/core/storage/sgraph_data/sgraph_constants.hpp +++ b/src/core/storage/sgraph_data/sgraph_constants.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SGRAPH_SGRAPH_CONTANTS_HPP #define TURI_SGRAPH_SGRAPH_CONTANTS_HPP #include +#include namespace turi { diff --git a/src/core/storage/sgraph_data/sgraph_edge_apply.hpp b/src/core/storage/sgraph_data/sgraph_edge_apply.hpp index 5590ae81e6..4068bcd0c3 100644 --- a/src/core/storage/sgraph_data/sgraph_edge_apply.hpp +++ b/src/core/storage/sgraph_data/sgraph_edge_apply.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_engine.hpp b/src/core/storage/sgraph_data/sgraph_engine.hpp index 290587f1b3..f2522dee3c 100644 --- a/src/core/storage/sgraph_data/sgraph_engine.hpp +++ b/src/core/storage/sgraph_data/sgraph_engine.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_fast_triple_apply.cpp b/src/core/storage/sgraph_data/sgraph_fast_triple_apply.cpp index 2eb89460ca..9273c6f833 100644 --- a/src/core/storage/sgraph_data/sgraph_fast_triple_apply.cpp +++ b/src/core/storage/sgraph_data/sgraph_fast_triple_apply.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_fast_triple_apply.hpp b/src/core/storage/sgraph_data/sgraph_fast_triple_apply.hpp index c6f9fe8943..ed5358f3e1 100644 --- a/src/core/storage/sgraph_data/sgraph_fast_triple_apply.hpp +++ b/src/core/storage/sgraph_data/sgraph_fast_triple_apply.hpp @@ -6,9 +6,10 @@ #ifndef TURI_SGRAPH_SGRAPH_FAST_TRIPLE_APPLY #define TURI_SGRAPH_SGRAPH_FAST_TRIPLE_APPLY -#include -#include -#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/storage/sgraph_data/sgraph_io.cpp b/src/core/storage/sgraph_data/sgraph_io.cpp index 434882b05e..783d5e1428 100644 --- a/src/core/storage/sgraph_data/sgraph_io.cpp +++ b/src/core/storage/sgraph_data/sgraph_io.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_io.hpp b/src/core/storage/sgraph_data/sgraph_io.hpp index 2e2fd0be87..93641b7af3 100644 --- a/src/core/storage/sgraph_data/sgraph_io.hpp +++ b/src/core/storage/sgraph_data/sgraph_io.hpp @@ -6,7 +6,8 @@ #ifndef TURI_SGRAPH_IO_HPP #define TURI_SGRAPH_IO_HPP -#include +#include +#include class sgraph; diff --git a/src/core/storage/sgraph_data/sgraph_synchronize.hpp b/src/core/storage/sgraph_data/sgraph_synchronize.hpp index e0d1adc17e..1160777ffe 100644 --- a/src/core/storage/sgraph_data/sgraph_synchronize.hpp +++ b/src/core/storage/sgraph_data/sgraph_synchronize.hpp @@ -6,8 +6,9 @@ #ifndef TURI_SGRAPH_SGRAPH_SYNCHRONIZE_HPP #define TURI_SGRAPH_SGRAPH_SYNCHRONIZE_HPP -#include -#include +#include +#include +#include namespace turi { /** diff --git a/src/core/storage/sgraph_data/sgraph_synchronize_interface.hpp b/src/core/storage/sgraph_data/sgraph_synchronize_interface.hpp index f50b89a217..9b795feeb1 100644 --- a/src/core/storage/sgraph_data/sgraph_synchronize_interface.hpp +++ b/src/core/storage/sgraph_data/sgraph_synchronize_interface.hpp @@ -6,7 +6,8 @@ #ifndef TURI_SGRAPH_SGRAPH_SYNCHRONIZE_INTERFACE_HPP #define TURI_SGRAPH_SGRAPH_SYNCHRONIZE_INTERFACE_HPP -#include +#include +#include namespace turi { diff --git a/src/core/storage/sgraph_data/sgraph_triple_apply.cpp b/src/core/storage/sgraph_data/sgraph_triple_apply.cpp index fc24979ffa..42b4f10718 100644 --- a/src/core/storage/sgraph_data/sgraph_triple_apply.cpp +++ b/src/core/storage/sgraph_data/sgraph_triple_apply.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/storage/sgraph_data/sgraph_triple_apply.hpp b/src/core/storage/sgraph_data/sgraph_triple_apply.hpp index 9a8f9b9236..0bebe2d992 100644 --- a/src/core/storage/sgraph_data/sgraph_triple_apply.hpp +++ b/src/core/storage/sgraph_data/sgraph_triple_apply.hpp @@ -6,9 +6,10 @@ #ifndef TURI_SGRAPH_SGRAPH_TRIPLE_APPLY #define TURI_SGRAPH_SGRAPH_TRIPLE_APPLY -#include -#include -#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/storage/sgraph_data/sgraph_types.hpp b/src/core/storage/sgraph_data/sgraph_types.hpp index 58cb17374f..359a932cb1 100644 --- a/src/core/storage/sgraph_data/sgraph_types.hpp +++ b/src/core/storage/sgraph_data/sgraph_types.hpp @@ -6,7 +6,8 @@ #ifndef TURI_SGRAPH_SGRAPH_TYPES_HPP #define TURI_SGRAPH_SGRAPH_TYPES_HPP -#include +#include +#include namespace turi { diff --git a/src/core/storage/sgraph_data/sgraph_vertex_apply.hpp b/src/core/storage/sgraph_data/sgraph_vertex_apply.hpp index 4afda3ff2e..c935cd1345 100644 --- a/src/core/storage/sgraph_data/sgraph_vertex_apply.hpp +++ b/src/core/storage/sgraph_data/sgraph_vertex_apply.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/storage/storage.hpp b/src/core/storage/storage.hpp index a04c4594b0..99a86c2040 100644 --- a/src/core/storage/storage.hpp +++ b/src/core/storage/storage.hpp @@ -1,6 +1,7 @@ #ifndef TURI_CORE_STORAGE_HPP_ #define TURI_CORE_STORAGE_HPP_ +#include #include #include #include diff --git a/src/core/storage/storage_forward.hpp b/src/core/storage/storage_forward.hpp index e5c2aa11de..3c70e7b862 100644 --- a/src/core/storage/storage_forward.hpp +++ b/src/core/storage/storage_forward.hpp @@ -10,3 +10,4 @@ namespace turi { } #endif +#include diff --git a/src/core/system/CMakeLists.txt b/src/core/system/CMakeLists.txt deleted file mode 100644 index d0b0261ec9..0000000000 --- a/src/core/system/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -subdirs(cppipc -exceptions -lambda -nanosockets -platform -startup_teardown) diff --git a/src/core/system/cppipc/CMakeLists.txt b/src/core/system/cppipc/CMakeLists.txt deleted file mode 100644 index ade9bd2038..0000000000 --- a/src/core/system/cppipc/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -project(Turi) - -if(WIN32) - SET(PLATFORM_SOURCES client/console_cancel_handler_win.cpp) -else() - SET(PLATFORM_SOURCES client/console_cancel_handler_unix.cpp) -endif() - -# Libraries should not link both cppipc and cppipc_zookeeper together -# They are not compatible -make_library(cppipc - OBJECT - SOURCES - client/comm_client.cpp - ${PLATFORM_SOURCES} - common/message_types.cpp - common/object_factory.cpp - common/object_factory_impl.cpp - common/ipc_deserializer.cpp - server/comm_server.cpp - ipc_object_base.cpp - REQUIRES - nanosockets boost logger cancel_serverside_ops -) - -make_library(cancel_serverside_ops - OBJECT - SOURCES - server/cancel_ops.cpp -) diff --git a/src/core/system/cppipc/client/comm_client.cpp b/src/core/system/cppipc/client/comm_client.cpp index 076cde277f..0d5aae67ae 100644 --- a/src/core/system/cppipc/client/comm_client.cpp +++ b/src/core/system/cppipc/client/comm_client.cpp @@ -3,12 +3,13 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include #include -#include +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/client/comm_client.hpp b/src/core/system/cppipc/client/comm_client.hpp index d11c881dfb..22d8dd06ef 100644 --- a/src/core/system/cppipc/client/comm_client.hpp +++ b/src/core/system/cppipc/client/comm_client.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/cppipc/client/console_cancel_handler.hpp b/src/core/system/cppipc/client/console_cancel_handler.hpp index 3281f62fc5..23bf10030b 100644 --- a/src/core/system/cppipc/client/console_cancel_handler.hpp +++ b/src/core/system/cppipc/client/console_cancel_handler.hpp @@ -7,6 +7,7 @@ #define CPPIPC_SERVER_CONSOLE_CANCEL_HANDLER_HPP #include #include +#include #include /** * \ingroup cppipc diff --git a/src/core/system/cppipc/client/console_cancel_handler_unix.cpp b/src/core/system/cppipc/client/console_cancel_handler_unix.cpp index 6ff5c66d42..6496f9056a 100644 --- a/src/core/system/cppipc/client/console_cancel_handler_unix.cpp +++ b/src/core/system/cppipc/client/console_cancel_handler_unix.cpp @@ -3,6 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ + +#if defined(__APPLE__) || defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) + +#include #include #include #include @@ -72,3 +76,5 @@ void console_cancel_handler_unix::raise_cancel() { } } // namespace cppipc + +#endif diff --git a/src/core/system/cppipc/client/console_cancel_handler_unix.hpp b/src/core/system/cppipc/client/console_cancel_handler_unix.hpp index 0cb8087391..053c4b6039 100644 --- a/src/core/system/cppipc/client/console_cancel_handler_unix.hpp +++ b/src/core/system/cppipc/client/console_cancel_handler_unix.hpp @@ -7,6 +7,7 @@ #define CPPIPC_SERVER_CONSOLE_CANCEL_HANDLER_UNIX_HPP #include +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/client/console_cancel_handler_win.cpp b/src/core/system/cppipc/client/console_cancel_handler_win.cpp index 3ace4b325a..9c66963fcd 100644 --- a/src/core/system/cppipc/client/console_cancel_handler_win.cpp +++ b/src/core/system/cppipc/client/console_cancel_handler_win.cpp @@ -3,10 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ + +#ifdef _WIN32 + +#include #include #include #include -#include +#include namespace cppipc { @@ -49,3 +53,5 @@ void console_cancel_handler_win::raise_cancel() { } } // namespace cppipc + +#endif diff --git a/src/core/system/cppipc/client/console_cancel_handler_win.hpp b/src/core/system/cppipc/client/console_cancel_handler_win.hpp index c200e8d2e2..7c5ccc3f58 100644 --- a/src/core/system/cppipc/client/console_cancel_handler_win.hpp +++ b/src/core/system/cppipc/client/console_cancel_handler_win.hpp @@ -3,9 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#ifdef _WIN32 + #ifndef CPPIPC_SERVER_CONSOLE_CANCEL_HANDLER_WIN_HPP #define CPPIPC_SERVER_CONSOLE_CANCEL_HANDLER_WIN_HPP +#include #include namespace cppipc { @@ -25,3 +28,5 @@ class console_cancel_handler_win : public console_cancel_handler { #endif //CPPIPC_SERVER_CONSOLE_CANCEL_HANDLER_WIN_HPP + +#endif diff --git a/src/core/system/cppipc/client/issue.hpp b/src/core/system/cppipc/client/issue.hpp index e15de59994..33aef6d2e5 100644 --- a/src/core/system/cppipc/client/issue.hpp +++ b/src/core/system/cppipc/client/issue.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_CLIENT_ISSUE_HPP #define CPPIPC_CLIENT_ISSUE_HPP #include +#include #include #include #include diff --git a/src/core/system/cppipc/client/object_proxy.hpp b/src/core/system/cppipc/client/object_proxy.hpp index eabc348599..1f2c21e11d 100644 --- a/src/core/system/cppipc/client/object_proxy.hpp +++ b/src/core/system/cppipc/client/object_proxy.hpp @@ -7,6 +7,7 @@ #define CPPIPC_CLIENT_CLIENT_HPP #include #include +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/authentication_base.hpp b/src/core/system/cppipc/common/authentication_base.hpp index bc79b3eaa5..e325f6987b 100644 --- a/src/core/system/cppipc/common/authentication_base.hpp +++ b/src/core/system/cppipc/common/authentication_base.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_COMMON_AUTHENTICATION_BASE_HPP #define CPPIPC_COMMON_AUTHENTICATION_BASE_HPP #include +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/authentication_token_method.hpp b/src/core/system/cppipc/common/authentication_token_method.hpp index 8e90fc1545..f09fe50716 100644 --- a/src/core/system/cppipc/common/authentication_token_method.hpp +++ b/src/core/system/cppipc/common/authentication_token_method.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_COMMON_AUTHENTICATION_TOKEN_HPP #define CPPIPC_COMMON_AUTHENTICATION_TOKEN_HPP #include +#include #include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/ipc_deserializer.cpp b/src/core/system/cppipc/common/ipc_deserializer.cpp index 7ced3d979d..1ff8a03901 100644 --- a/src/core/system/cppipc/common/ipc_deserializer.cpp +++ b/src/core/system/cppipc/common/ipc_deserializer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/cppipc/common/ipc_deserializer.hpp b/src/core/system/cppipc/common/ipc_deserializer.hpp index 8ddfc2696b..229b5c8d68 100644 --- a/src/core/system/cppipc/common/ipc_deserializer.hpp +++ b/src/core/system/cppipc/common/ipc_deserializer.hpp @@ -7,6 +7,7 @@ #define CPPIPC_IPC_DESERIALIZER_HPP #ifdef DISABLE_TURI_CPPIPC_PROXY_GENERATION +#include #include #else diff --git a/src/core/system/cppipc/common/ipc_deserializer_minimal.hpp b/src/core/system/cppipc/common/ipc_deserializer_minimal.hpp index 3815cc6261..408e1737cf 100644 --- a/src/core/system/cppipc/common/ipc_deserializer_minimal.hpp +++ b/src/core/system/cppipc/common/ipc_deserializer_minimal.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_IPC_DESERIALIZER_MINIMAL_HPP #define CPPIPC_IPC_DESERIALIZER_MINIMAL_HPP #include +#include #include #include diff --git a/src/core/system/cppipc/common/message_types.cpp b/src/core/system/cppipc/common/message_types.cpp index 7ab8aa21d3..2bcadb2997 100644 --- a/src/core/system/cppipc/common/message_types.cpp +++ b/src/core/system/cppipc/common/message_types.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/message_types.hpp b/src/core/system/cppipc/common/message_types.hpp index 3227b919cc..76924f25d7 100644 --- a/src/core/system/cppipc/common/message_types.hpp +++ b/src/core/system/cppipc/common/message_types.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/cppipc/common/object_factory.cpp b/src/core/system/cppipc/common/object_factory.cpp index 13a5a53359..b35dab85dd 100644 --- a/src/core/system/cppipc/common/object_factory.cpp +++ b/src/core/system/cppipc/common/object_factory.cpp @@ -3,3 +3,4 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include diff --git a/src/core/system/cppipc/common/object_factory_base.hpp b/src/core/system/cppipc/common/object_factory_base.hpp index 79109a7e98..8a1ff6aa70 100644 --- a/src/core/system/cppipc/common/object_factory_base.hpp +++ b/src/core/system/cppipc/common/object_factory_base.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/object_factory_impl.cpp b/src/core/system/cppipc/common/object_factory_impl.cpp index 94d2005958..37422fcb79 100644 --- a/src/core/system/cppipc/common/object_factory_impl.cpp +++ b/src/core/system/cppipc/common/object_factory_impl.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/cppipc/common/object_factory_impl.hpp b/src/core/system/cppipc/common/object_factory_impl.hpp index 15629fc90f..d310122b1b 100644 --- a/src/core/system/cppipc/common/object_factory_impl.hpp +++ b/src/core/system/cppipc/common/object_factory_impl.hpp @@ -5,6 +5,7 @@ */ #ifndef CPPIPC_COMMON_OBJECT_FACTORY_IMPL_HPP #define CPPIPC_COMMON_OBJECT_FACTORY_IMPL_HPP +#include #include #include #include diff --git a/src/core/system/cppipc/common/object_factory_proxy.hpp b/src/core/system/cppipc/common/object_factory_proxy.hpp index bbf744ca80..25dcb697cc 100644 --- a/src/core/system/cppipc/common/object_factory_proxy.hpp +++ b/src/core/system/cppipc/common/object_factory_proxy.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include namespace cppipc { diff --git a/src/core/system/cppipc/common/status_types.hpp b/src/core/system/cppipc/common/status_types.hpp index 68b02e7841..fb3efa42f9 100644 --- a/src/core/system/cppipc/common/status_types.hpp +++ b/src/core/system/cppipc/common/status_types.hpp @@ -19,3 +19,4 @@ namespace cppipc { } // namespace cppipc #endif +#include diff --git a/src/core/system/cppipc/cppipc.hpp b/src/core/system/cppipc/cppipc.hpp index 0ee9f41144..cbc00a31d7 100644 --- a/src/core/system/cppipc/cppipc.hpp +++ b/src/core/system/cppipc/cppipc.hpp @@ -5,6 +5,7 @@ */ #ifndef CPPIPC_CPPIPC_HPP #define CPPIPC_CPPIPC_HPP +#include #include #include #include diff --git a/src/core/system/cppipc/ipc_object_base.cpp b/src/core/system/cppipc/ipc_object_base.cpp index afe14c0656..50ca71aeef 100644 --- a/src/core/system/cppipc/ipc_object_base.cpp +++ b/src/core/system/cppipc/ipc_object_base.cpp @@ -1,3 +1,4 @@ +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/ipc_object_base.hpp b/src/core/system/cppipc/ipc_object_base.hpp index 0a4ca5f3c6..8be3d0dde8 100644 --- a/src/core/system/cppipc/ipc_object_base.hpp +++ b/src/core/system/cppipc/ipc_object_base.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_IPC_OBJECT_BASE_HPP #define CPPIPC_IPC_OBJECT_BASE_HPP #include +#include #include /** * All exported base classes must inherit from this class. diff --git a/src/core/system/cppipc/magic_macros.hpp b/src/core/system/cppipc/magic_macros.hpp index db209ddd03..bfb6268bd3 100644 --- a/src/core/system/cppipc/magic_macros.hpp +++ b/src/core/system/cppipc/magic_macros.hpp @@ -5,6 +5,7 @@ */ #ifndef CPPIPC_MAGIC_MACROS_HPP #define CPPIPC_MAGIC_MACROS_HPP +#include #include #include #ifndef DISABLE_TURI_CPPIPC_PROXY_GENERATION diff --git a/src/core/system/cppipc/registration_macros.hpp b/src/core/system/cppipc/registration_macros.hpp index 3f33301588..03f999a272 100644 --- a/src/core/system/cppipc/registration_macros.hpp +++ b/src/core/system/cppipc/registration_macros.hpp @@ -94,3 +94,4 @@ #define REGISTRATION_END } #endif //CPPIPC_REGISTRATION_MACROS_HPP +#include diff --git a/src/core/system/cppipc/server/cancel_ops.cpp b/src/core/system/cppipc/server/cancel_ops.cpp index 37c63f65aa..d66948581d 100644 --- a/src/core/system/cppipc/server/cancel_ops.cpp +++ b/src/core/system/cppipc/server/cancel_ops.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "core/system/cppipc/server/cancel_ops.hpp" #include diff --git a/src/core/system/cppipc/server/cancel_ops.hpp b/src/core/system/cppipc/server/cancel_ops.hpp index 72f9d2067d..80bdb5cccb 100644 --- a/src/core/system/cppipc/server/cancel_ops.hpp +++ b/src/core/system/cppipc/server/cancel_ops.hpp @@ -7,6 +7,7 @@ #define CPPIPC_SERVER_CANCEL_OPS_HPP #include #include +#include namespace cppipc { diff --git a/src/core/system/cppipc/server/comm_server.cpp b/src/core/system/cppipc/server/comm_server.cpp index d3e16b6c2b..68512486bc 100644 --- a/src/core/system/cppipc/server/comm_server.cpp +++ b/src/core/system/cppipc/server/comm_server.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/system/cppipc/server/comm_server.hpp b/src/core/system/cppipc/server/comm_server.hpp index b9ee0dd2cb..d2d6fe1572 100644 --- a/src/core/system/cppipc/server/comm_server.hpp +++ b/src/core/system/cppipc/server/comm_server.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/cppipc/server/dispatch.hpp b/src/core/system/cppipc/server/dispatch.hpp index 6081716f7d..54ac9c642e 100644 --- a/src/core/system/cppipc/server/dispatch.hpp +++ b/src/core/system/cppipc/server/dispatch.hpp @@ -5,6 +5,7 @@ */ #ifndef CPPIPC_SERVER_DISPATCH_HPP #define CPPIPC_SERVER_DISPATCH_HPP +#include #include namespace cppipc { diff --git a/src/core/system/cppipc/server/dispatch_impl.hpp b/src/core/system/cppipc/server/dispatch_impl.hpp index cf58170818..845f8f0cc3 100644 --- a/src/core/system/cppipc/server/dispatch_impl.hpp +++ b/src/core/system/cppipc/server/dispatch_impl.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/core/system/cppipc/util/generics/member_function_return_type.hpp b/src/core/system/cppipc/util/generics/member_function_return_type.hpp index c27a8aae60..3313d76673 100644 --- a/src/core/system/cppipc/util/generics/member_function_return_type.hpp +++ b/src/core/system/cppipc/util/generics/member_function_return_type.hpp @@ -20,3 +20,4 @@ struct member_function_return_type { } // cppipc #endif +#include diff --git a/src/core/system/cppipc/util/generics/tuple.hpp b/src/core/system/cppipc/util/generics/tuple.hpp index 23bd7b22e5..eff5f239be 100644 --- a/src/core/system/cppipc/util/generics/tuple.hpp +++ b/src/core/system/cppipc/util/generics/tuple.hpp @@ -6,6 +6,7 @@ #ifndef CPPIPC_UTIL_GENERICS_TUPLE_HPP #define CPPIPC_UTIL_GENERICS_TUPLE_HPP #include +#include namespace cppipc { namespace tuple_detail { diff --git a/src/core/system/exceptions/error_types.hpp b/src/core/system/exceptions/error_types.hpp index 25cf9224cb..a73d55e374 100644 --- a/src/core/system/exceptions/error_types.hpp +++ b/src/core/system/exceptions/error_types.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/system/lambda/CMakeLists.txt b/src/core/system/lambda/CMakeLists.txt deleted file mode 100644 index fc12ced197..0000000000 --- a/src/core/system/lambda/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -project(Turi) - -make_library(python_callbacks OBJECT - SOURCES - python_callbacks.cpp - REQUIRES - logger -) - -make_library(pylambda OBJECT - SOURCES - worker_pool.cpp - lambda_constants.cpp - lambda_master.cpp - pylambda_function.cpp - graph_pylambda_master.cpp - REQUIRES - flexible_type cppipc sframe shmipc process python_callbacks - EXTERNAL_VISIBILITY -) - -make_library(pylambda_worker OBJECT - SOURCES - pylambda.cpp - pylambda_worker.cpp - graph_pylambda.cpp - REQUIRES - flexible_type cppipc sframe shmipc process python_callbacks - EXTERNAL_VISIBILITY -) diff --git a/src/core/system/lambda/graph_lambda_interface.hpp b/src/core/system/lambda/graph_lambda_interface.hpp index 704a4923ce..a75995a082 100644 --- a/src/core/system/lambda/graph_lambda_interface.hpp +++ b/src/core/system/lambda/graph_lambda_interface.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_LAMBDA_GRAPH_LAMBDA_INTERFACE_HPP #define TURI_LAMBDA_GRAPH_LAMBDA_INTERFACE_HPP +#include #include #include #include diff --git a/src/core/system/lambda/graph_pylambda.cpp b/src/core/system/lambda/graph_pylambda.cpp index a70cd71689..a8114f3fcb 100644 --- a/src/core/system/lambda/graph_pylambda.cpp +++ b/src/core/system/lambda/graph_pylambda.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/lambda/graph_pylambda.hpp b/src/core/system/lambda/graph_pylambda.hpp index ac98fb11db..3fcdfb3877 100644 --- a/src/core/system/lambda/graph_pylambda.hpp +++ b/src/core/system/lambda/graph_pylambda.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_LAMBDA_GRAPH_PYLAMBDA_EVALUATOR_HPP #define TURI_LAMBDA_GRAPH_PYLAMBDA_EVALUATOR_HPP +#include #include #include #include diff --git a/src/core/system/lambda/graph_pylambda_master.cpp b/src/core/system/lambda/graph_pylambda_master.cpp index 5cbca6c45f..393680eb80 100644 --- a/src/core/system/lambda/graph_pylambda_master.cpp +++ b/src/core/system/lambda/graph_pylambda_master.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/lambda/graph_pylambda_master.hpp b/src/core/system/lambda/graph_pylambda_master.hpp index 1509f40445..069549c46f 100644 --- a/src/core/system/lambda/graph_pylambda_master.hpp +++ b/src/core/system/lambda/graph_pylambda_master.hpp @@ -6,8 +6,9 @@ #ifndef TURI_LAMBDA_GRAPH_PYLAMBDA_MASTER_HPP #define TURI_LAMBDA_GRAPH_PYLAMBDA_MASTER_HPP -#include -#include +#include +#include +#include namespace turi { diff --git a/src/core/system/lambda/lambda_constants.cpp b/src/core/system/lambda/lambda_constants.cpp index 52b0adcfd4..0acb567d1c 100644 --- a/src/core/system/lambda/lambda_constants.cpp +++ b/src/core/system/lambda/lambda_constants.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/lambda/lambda_constants.hpp b/src/core/system/lambda/lambda_constants.hpp index 30d0e2079f..e85bdc409f 100644 --- a/src/core/system/lambda/lambda_constants.hpp +++ b/src/core/system/lambda/lambda_constants.hpp @@ -6,6 +6,7 @@ #ifndef TURI_LAMBDA_CONSTANTS_HPP #define TURI_LAMBDA_CONSTANTS_HPP #include +#include namespace turi { diff --git a/src/core/system/lambda/lambda_interface.hpp b/src/core/system/lambda/lambda_interface.hpp index f81898ca74..b20ddd2f2b 100644 --- a/src/core/system/lambda/lambda_interface.hpp +++ b/src/core/system/lambda/lambda_interface.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_LAMBDA_LAMBDA_INTERFACE_HPP #define TURI_LAMBDA_LAMBDA_INTERFACE_HPP +#include #include #include #include diff --git a/src/core/system/lambda/lambda_master.cpp b/src/core/system/lambda/lambda_master.cpp index 93abe73638..d0ea6303ba 100644 --- a/src/core/system/lambda/lambda_master.cpp +++ b/src/core/system/lambda/lambda_master.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include #include #include -#include +#include #include namespace turi { namespace lambda { diff --git a/src/core/system/lambda/lambda_master.hpp b/src/core/system/lambda/lambda_master.hpp index 7f2e0f4e97..fb71ee821e 100644 --- a/src/core/system/lambda/lambda_master.hpp +++ b/src/core/system/lambda/lambda_master.hpp @@ -7,6 +7,7 @@ #define TURI_LAMBDA_LAMBDA_MASTER_HPP #include +#include #include #include #include diff --git a/src/core/system/lambda/lambda_utils.hpp b/src/core/system/lambda/lambda_utils.hpp index 9305722a06..89f191701a 100644 --- a/src/core/system/lambda/lambda_utils.hpp +++ b/src/core/system/lambda/lambda_utils.hpp @@ -6,7 +6,8 @@ #ifndef TURI_LAMBDA_LAMBDA_UTILS_HPP #define TURI_LAMBDA_LAMBDA_UTILS_HPP -#include +#include +#include namespace turi { namespace lambda { diff --git a/src/core/system/lambda/pylambda.cpp b/src/core/system/lambda/pylambda.cpp index b1813742ad..9c39ce50ad 100644 --- a/src/core/system/lambda/pylambda.cpp +++ b/src/core/system/lambda/pylambda.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include #include #include -#include +#include namespace turi { namespace lambda { diff --git a/src/core/system/lambda/pylambda.hpp b/src/core/system/lambda/pylambda.hpp index 32473e20fb..577ccc8b58 100644 --- a/src/core/system/lambda/pylambda.hpp +++ b/src/core/system/lambda/pylambda.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_LAMBDA_PYLAMBDA_EVALUATOR_HPP #define TURI_LAMBDA_PYLAMBDA_EVALUATOR_HPP +#include #include #include #include diff --git a/src/core/system/lambda/pylambda_function.cpp b/src/core/system/lambda/pylambda_function.cpp index e16f2a5366..622e6d7720 100644 --- a/src/core/system/lambda/pylambda_function.cpp +++ b/src/core/system/lambda/pylambda_function.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/lambda/pylambda_function.hpp b/src/core/system/lambda/pylambda_function.hpp index fdb3191cff..463a79efcb 100644 --- a/src/core/system/lambda/pylambda_function.hpp +++ b/src/core/system/lambda/pylambda_function.hpp @@ -6,9 +6,10 @@ #ifndef TURI_LAMBDA_PYLAMBDA_FUNCTION_HPP #define TURI_LAMBDA_PYLAMBDA_FUNCTION_HPP -#include -#include -#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/system/lambda/pylambda_worker.cpp b/src/core/system/lambda/pylambda_worker.cpp index 4dbf5196e7..0d9170c686 100644 --- a/src/core/system/lambda/pylambda_worker.cpp +++ b/src/core/system/lambda/pylambda_worker.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include -#include +#include #include #include -#include +#include #include namespace turi { namespace lambda { diff --git a/src/core/system/lambda/pylambda_worker.hpp b/src/core/system/lambda/pylambda_worker.hpp index 966fda5f2a..b760a91b1d 100644 --- a/src/core/system/lambda/pylambda_worker.hpp +++ b/src/core/system/lambda/pylambda_worker.hpp @@ -7,6 +7,7 @@ #define TURI_LAMBDA_PYLAMBDA_WORKER_H_ #include +#include namespace turi { namespace lambda { diff --git a/src/core/system/lambda/python_callbacks.cpp b/src/core/system/lambda/python_callbacks.cpp index 038e3d965c..cec3903ea8 100644 --- a/src/core/system/lambda/python_callbacks.cpp +++ b/src/core/system/lambda/python_callbacks.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/system/lambda/python_callbacks.hpp b/src/core/system/lambda/python_callbacks.hpp index cd4bff1fd8..69d00ea6f4 100644 --- a/src/core/system/lambda/python_callbacks.hpp +++ b/src/core/system/lambda/python_callbacks.hpp @@ -6,6 +6,7 @@ #ifndef TURI_PYTHON_CALLBACKS_H_ #define TURI_PYTHON_CALLBACKS_H_ +#include #include #include #include diff --git a/src/core/system/lambda/worker_pool.cpp b/src/core/system/lambda/worker_pool.cpp index 5422ca126a..bdd5bd6e15 100644 --- a/src/core/system/lambda/worker_pool.cpp +++ b/src/core/system/lambda/worker_pool.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/system/lambda/worker_pool.hpp b/src/core/system/lambda/worker_pool.hpp index a421bfbb36..9ae399ac70 100644 --- a/src/core/system/lambda/worker_pool.hpp +++ b/src/core/system/lambda/worker_pool.hpp @@ -6,16 +6,17 @@ #ifndef TURI_LAMBDA_WORKER_POOL_HPP #define TURI_LAMBDA_WORKER_POOL_HPP -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace turi { diff --git a/src/core/system/nanosockets/CMakeLists.txt b/src/core/system/nanosockets/CMakeLists.txt deleted file mode 100644 index 90e2456dfd..0000000000 --- a/src/core/system/nanosockets/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -project(Turi) - -make_library(nanosockets OBJECT - SOURCES - async_reply_socket.cpp - async_request_socket.cpp - print_zmq_error.cpp - zmq_msg_vector.cpp - socket_config.cpp - subscribe_socket.cpp - publish_socket.cpp - get_next_port_number.cpp - REQUIRES - network - util - timer - parallel - logger - globals - nanomsg -) diff --git a/src/core/system/nanosockets/async_reply_socket.cpp b/src/core/system/nanosockets/async_reply_socket.cpp index 5e152a259e..42805cec63 100644 --- a/src/core/system/nanosockets/async_reply_socket.cpp +++ b/src/core/system/nanosockets/async_reply_socket.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,7 @@ #include #include #include -#include +#include extern "C" { #include #include diff --git a/src/core/system/nanosockets/async_reply_socket.hpp b/src/core/system/nanosockets/async_reply_socket.hpp index ae4b18e8dc..002c32f865 100644 --- a/src/core/system/nanosockets/async_reply_socket.hpp +++ b/src/core/system/nanosockets/async_reply_socket.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/nanosockets/async_request_socket.cpp b/src/core/system/nanosockets/async_request_socket.cpp index 0e6c214493..8823dac15c 100644 --- a/src/core/system/nanosockets/async_request_socket.cpp +++ b/src/core/system/nanosockets/async_request_socket.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/system/nanosockets/async_request_socket.hpp b/src/core/system/nanosockets/async_request_socket.hpp index 9b00c7901d..3f71abd8de 100644 --- a/src/core/system/nanosockets/async_request_socket.hpp +++ b/src/core/system/nanosockets/async_request_socket.hpp @@ -7,6 +7,7 @@ #define NANOSOCKETS_SOCKETS_ASYNC_REQUEST_SOCKET_HPP #include #include +#include #include #include #include diff --git a/src/core/system/nanosockets/get_next_port_number.cpp b/src/core/system/nanosockets/get_next_port_number.cpp index 13f6d6055e..a1b34af817 100644 --- a/src/core/system/nanosockets/get_next_port_number.cpp +++ b/src/core/system/nanosockets/get_next_port_number.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/nanosockets/get_next_port_number.hpp b/src/core/system/nanosockets/get_next_port_number.hpp index fe8732ba76..b2e5ef0a3e 100644 --- a/src/core/system/nanosockets/get_next_port_number.hpp +++ b/src/core/system/nanosockets/get_next_port_number.hpp @@ -5,6 +5,7 @@ */ #ifndef FAULT_SOCKETS_GET_NEXT_PORT_NUMBER_HPP #define FAULT_SOCKETS_GET_NEXT_PORT_NUMBER_HPP +#include #include #include namespace turi { diff --git a/src/core/system/nanosockets/print_zmq_error.cpp b/src/core/system/nanosockets/print_zmq_error.cpp index e6583f4dbc..6bcbe32483 100644 --- a/src/core/system/nanosockets/print_zmq_error.cpp +++ b/src/core/system/nanosockets/print_zmq_error.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/nanosockets/print_zmq_error.hpp b/src/core/system/nanosockets/print_zmq_error.hpp index 52672022d8..77f76c4cd0 100644 --- a/src/core/system/nanosockets/print_zmq_error.hpp +++ b/src/core/system/nanosockets/print_zmq_error.hpp @@ -11,3 +11,4 @@ extern void print_zmq_error(const char* prefix); } } #endif +#include diff --git a/src/core/system/nanosockets/publish_socket.cpp b/src/core/system/nanosockets/publish_socket.cpp index c237c07307..86434ed2d1 100644 --- a/src/core/system/nanosockets/publish_socket.cpp +++ b/src/core/system/nanosockets/publish_socket.cpp @@ -4,12 +4,13 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include #include #include -#include +#include #include #include extern "C" { diff --git a/src/core/system/nanosockets/publish_socket.hpp b/src/core/system/nanosockets/publish_socket.hpp index 1093171cb9..77034e5653 100644 --- a/src/core/system/nanosockets/publish_socket.hpp +++ b/src/core/system/nanosockets/publish_socket.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/nanosockets/socket_config.cpp b/src/core/system/nanosockets/socket_config.cpp index a7e29c11a3..daa0fdc2cd 100644 --- a/src/core/system/nanosockets/socket_config.cpp +++ b/src/core/system/nanosockets/socket_config.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/core/system/nanosockets/socket_config.hpp b/src/core/system/nanosockets/socket_config.hpp index 97c30ac875..cb03217e03 100644 --- a/src/core/system/nanosockets/socket_config.hpp +++ b/src/core/system/nanosockets/socket_config.hpp @@ -6,6 +6,7 @@ #ifndef LIBNANOSOCKETS_SOCKET_CONFIG_HPP #define LIBNANOSOCKETS_SOCKET_CONFIG_HPP #include +#include namespace turi { namespace nanosockets { extern int SEND_TIMEOUT; diff --git a/src/core/system/nanosockets/socket_errors.hpp b/src/core/system/nanosockets/socket_errors.hpp index ffca9ded88..136dcb0964 100644 --- a/src/core/system/nanosockets/socket_errors.hpp +++ b/src/core/system/nanosockets/socket_errors.hpp @@ -5,5 +5,6 @@ */ #ifndef FAULT_SOCKETS_SOCKET_ERRORS_HPP #define FAULT_SOCKETS_SOCKET_ERRORS_HPP +#include #include #endif diff --git a/src/core/system/nanosockets/subscribe_socket.cpp b/src/core/system/nanosockets/subscribe_socket.cpp index 2ec0a734c8..a8181138f2 100644 --- a/src/core/system/nanosockets/subscribe_socket.cpp +++ b/src/core/system/nanosockets/subscribe_socket.cpp @@ -8,11 +8,12 @@ #include #include #include +#include #include #include #include #include -#include +#include extern "C" { #include diff --git a/src/core/system/nanosockets/subscribe_socket.hpp b/src/core/system/nanosockets/subscribe_socket.hpp index 7871be9b6a..37264fc1ab 100644 --- a/src/core/system/nanosockets/subscribe_socket.hpp +++ b/src/core/system/nanosockets/subscribe_socket.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/nanosockets/zmq_msg_vector.cpp b/src/core/system/nanosockets/zmq_msg_vector.cpp index fcee154fea..d6d31bda03 100644 --- a/src/core/system/nanosockets/zmq_msg_vector.cpp +++ b/src/core/system/nanosockets/zmq_msg_vector.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/system/nanosockets/zmq_msg_vector.hpp b/src/core/system/nanosockets/zmq_msg_vector.hpp index 1c4137f1fc..15cc935937 100644 --- a/src/core/system/nanosockets/zmq_msg_vector.hpp +++ b/src/core/system/nanosockets/zmq_msg_vector.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/platform/config/CMakeLists.txt b/src/core/system/platform/config/CMakeLists.txt deleted file mode 100644 index 81b7ddd190..0000000000 --- a/src/core/system/platform/config/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -project(Turi) - -#/**************************************************************************/ -#/* */ -#/* Random Library */ -#/* */ -#/**************************************************************************/ - -if(APPLE) - - make_library(platform_config OBJECT - SOURCES - apple_config.mm - REQUIRES - ${FOUNDATION} - EXTERNAL_VISIBILITY - ) - -endif() diff --git a/src/core/system/platform/config/apple_config.hpp b/src/core/system/platform/config/apple_config.hpp index d854640e10..76a883a983 100644 --- a/src/core/system/platform/config/apple_config.hpp +++ b/src/core/system/platform/config/apple_config.hpp @@ -2,6 +2,7 @@ #define TURI_APPLE_SYSTEM_CONFIG_H_ #include +#include #ifdef __APPLE__ diff --git a/src/core/system/platform/crash_handler/CMakeLists.txt b/src/core/system/platform/crash_handler/CMakeLists.txt deleted file mode 100644 index 196d820805..0000000000 --- a/src/core/system/platform/crash_handler/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -project(Turi) - -make_library(crash_handler OBJECT SOURCES crash_handler.cpp) diff --git a/src/core/system/platform/crash_handler/crash_handler.cpp b/src/core/system/platform/crash_handler/crash_handler.cpp index 9351e6dd77..21fd2ac40b 100644 --- a/src/core/system/platform/crash_handler/crash_handler.cpp +++ b/src/core/system/platform/crash_handler/crash_handler.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #ifndef _WIN32 +#include #include #include diff --git a/src/core/system/platform/crash_handler/crash_handler.hpp b/src/core/system/platform/crash_handler/crash_handler.hpp index 295168c593..228cecc8e4 100644 --- a/src/core/system/platform/crash_handler/crash_handler.hpp +++ b/src/core/system/platform/crash_handler/crash_handler.hpp @@ -7,6 +7,7 @@ #define TURI_UTIL_CRASH_HANDLER_HPP #include +#include #include // The filename which we write backtrace to, default empty and we write to STDERR_FILENO diff --git a/src/core/system/platform/cross_platform/windows_wrapper.hpp b/src/core/system/platform/cross_platform/windows_wrapper.hpp index 0db8366f26..dbed4536e1 100644 --- a/src/core/system/platform/cross_platform/windows_wrapper.hpp +++ b/src/core/system/platform/cross_platform/windows_wrapper.hpp @@ -13,6 +13,7 @@ // this by default. #ifdef _WIN32 +#include #include #include #endif diff --git a/src/core/system/platform/minipsutil/CMakeLists.txt b/src/core/system/platform/minipsutil/CMakeLists.txt deleted file mode 100644 index 3e96b95d57..0000000000 --- a/src/core/system/platform/minipsutil/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -make_library(minipsutil OBJECT - SOURCES - minipsutil.c -) diff --git a/src/core/system/platform/minipsutil/minipsutil.c b/src/core/system/platform/minipsutil/minipsutil.c index 5c8bba329d..2d511d920c 100644 --- a/src/core/system/platform/minipsutil/minipsutil.c +++ b/src/core/system/platform/minipsutil/minipsutil.c @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include /** * \defgroup minipsutil Mini Process Utilility Library @@ -28,7 +29,7 @@ int32_t pid_is_running(int32_t pid); /* Windows */ /* */ /**************************************************************************/ -#include +#include #include typedef BOOL (WINAPI *LPFN_GLPI)( diff --git a/src/core/system/platform/minipsutil/minipsutil.h b/src/core/system/platform/minipsutil/minipsutil.h index 5cb44bf89a..96b43ece59 100644 --- a/src/core/system/platform/minipsutil/minipsutil.h +++ b/src/core/system/platform/minipsutil/minipsutil.h @@ -5,6 +5,7 @@ */ #ifndef TURI_MINIPSUTIL_H #define TURI_MINIPSUTIL_H +#include #include extern "C" { diff --git a/src/core/system/platform/network/CMakeLists.txt b/src/core/system/platform/network/CMakeLists.txt deleted file mode 100644 index 34e7b227e2..0000000000 --- a/src/core/system/platform/network/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -project(Turi) - -make_library(network OBJECT - SOURCES - net_util.cpp - REQUIRES - logger -) diff --git a/src/core/system/platform/network/net_util.cpp b/src/core/system/platform/network/net_util.cpp index 3fe7de7182..6b3ba59dc9 100644 --- a/src/core/system/platform/network/net_util.cpp +++ b/src/core/system/platform/network/net_util.cpp @@ -9,6 +9,7 @@ #include #ifndef _WIN32 +#include #include #include #include @@ -19,7 +20,7 @@ #endif #include -#include +#include #include #define NUM_VM_MAC_ADDRS 8 diff --git a/src/core/system/platform/network/net_util.hpp b/src/core/system/platform/network/net_util.hpp index 4cc4ace0e5..f42a7ffadd 100644 --- a/src/core/system/platform/network/net_util.hpp +++ b/src/core/system/platform/network/net_util.hpp @@ -6,6 +6,7 @@ #ifndef TURI_NET_UTIL_HPP #define TURI_NET_UTIL_HPP #include +#include #include namespace turi { diff --git a/src/core/system/platform/perf/CMakeLists.txt b/src/core/system/platform/perf/CMakeLists.txt deleted file mode 100644 index cdf72ef51b..0000000000 --- a/src/core/system/platform/perf/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(Turi) - -make_library(perf OBJECT - SOURCES - tracepoint.cpp - REQUIRES - logger - EXTERNAL_VISIBILITY -) diff --git a/src/core/system/platform/perf/memory_info.hpp b/src/core/system/platform/perf/memory_info.hpp index 04027f2f68..f976bf893d 100644 --- a/src/core/system/platform/perf/memory_info.hpp +++ b/src/core/system/platform/perf/memory_info.hpp @@ -10,6 +10,7 @@ #include #include #ifdef HAS_TCMALLOC +#include #include #endif #include diff --git a/src/core/system/platform/perf/tracepoint.cpp b/src/core/system/platform/perf/tracepoint.cpp index 632c7e71ef..4deab84152 100644 --- a/src/core/system/platform/perf/tracepoint.cpp +++ b/src/core/system/platform/perf/tracepoint.cpp @@ -5,8 +5,9 @@ */ #include #include +#include #include -#include +#include #include #include diff --git a/src/core/system/platform/perf/tracepoint.hpp b/src/core/system/platform/perf/tracepoint.hpp index d33b2a81c1..d573913d97 100644 --- a/src/core/system/platform/perf/tracepoint.hpp +++ b/src/core/system/platform/perf/tracepoint.hpp @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -26,7 +27,7 @@ * predefining USE_TRACEPOINT globally. * \code * #define USE_TRACEPOINT - * #include "perf/tracepoint.hpp" + * #include * \endcode * * Example Usage: diff --git a/src/core/system/platform/process/CMakeLists.txt b/src/core/system/platform/process/CMakeLists.txt deleted file mode 100644 index 0d74ec5e28..0000000000 --- a/src/core/system/platform/process/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -project(Turi) - -if(WIN32) - SET(PLATFORM_SOURCES process_win.cpp process_util_win.cpp) -else() - SET(PLATFORM_SOURCES process_unix.cpp process_util_unix.cpp) -endif() - -make_library(process OBJECT - SOURCES - process.cpp - ${PLATFORM_SOURCES} - REQUIRES - boost - util - logger -) diff --git a/src/core/system/platform/process/process.cpp b/src/core/system/platform/process/process.cpp index b6ae406762..7cb16c7d0a 100644 --- a/src/core/system/platform/process/process.cpp +++ b/src/core/system/platform/process/process.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include namespace turi { diff --git a/src/core/system/platform/process/process.hpp b/src/core/system/platform/process/process.hpp index 3bf2baccb4..c9bc315b9e 100644 --- a/src/core/system/platform/process/process.hpp +++ b/src/core/system/platform/process/process.hpp @@ -18,10 +18,11 @@ #include #include +#include #include #ifdef _WIN32 -#include +#include #endif #ifdef __APPLE__ #include diff --git a/src/core/system/platform/process/process_unix.cpp b/src/core/system/platform/process/process_unix.cpp index 13a5d00457..84d2978202 100644 --- a/src/core/system/platform/process/process_unix.cpp +++ b/src/core/system/platform/process/process_unix.cpp @@ -3,7 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#if defined(__APPLE__) || defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) + +#include +#include #include #include #include @@ -341,3 +344,5 @@ void process::autoreap() { } } // namespace turi + +#endif diff --git a/src/core/system/platform/process/process_util.hpp b/src/core/system/platform/process/process_util.hpp index 6876f0efb9..cd4df542a0 100644 --- a/src/core/system/platform/process/process_util.hpp +++ b/src/core/system/platform/process/process_util.hpp @@ -6,8 +6,9 @@ #ifndef PROCESS_UTIL_HPP #define PROCESS_UTIL_HPP -#include -#include +#include +#include +#include namespace turi { diff --git a/src/core/system/platform/process/process_util_unix.cpp b/src/core/system/platform/process/process_util_unix.cpp index 7a39b351b5..d2c333888d 100644 --- a/src/core/system/platform/process/process_util_unix.cpp +++ b/src/core/system/platform/process/process_util_unix.cpp @@ -3,10 +3,13 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#if defined(__APPLE__) || defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) + +#include #include #include #include -#include +#include #include namespace turi { @@ -42,3 +45,5 @@ boost::optional getenv_str(const char* variable_name) { } } // namespace turi + +#endif diff --git a/src/core/system/platform/process/process_util_win.cpp b/src/core/system/platform/process/process_util_win.cpp index 7b8916f84f..af3fe9f46b 100644 --- a/src/core/system/platform/process/process_util_win.cpp +++ b/src/core/system/platform/process/process_util_win.cpp @@ -3,9 +3,13 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include + +#ifdef _WIN32 + +#include +#include #include -#include +#include #include namespace turi { @@ -80,3 +84,5 @@ boost::optional getenv_str(const char* variable_name) { } } // namespace turi + +#endif diff --git a/src/core/system/platform/process/process_win.cpp b/src/core/system/platform/process/process_win.cpp index da1fbbd88c..0c31fc4336 100644 --- a/src/core/system/platform/process/process_win.cpp +++ b/src/core/system/platform/process/process_win.cpp @@ -3,7 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#ifdef _WIN + +#include +#include #include #include @@ -360,3 +363,5 @@ void process::set_nonblocking(bool nonblocking) { } } //namespace turi + +#endif diff --git a/src/core/system/platform/shmipc/CMakeLists.txt b/src/core/system/platform/shmipc/CMakeLists.txt deleted file mode 100644 index 1ed1f80a80..0000000000 --- a/src/core/system/platform/shmipc/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(Turi) - -make_library(shmipc OBJECT - SOURCES - shmipc.cpp - shmipc_garbage_collect.cpp - REQUIRES - logger fileio -) diff --git a/src/core/system/platform/shmipc/boost_alt_winapi.h b/src/core/system/platform/shmipc/boost_alt_winapi.h index e533021780..e9ab61b811 100644 --- a/src/core/system/platform/shmipc/boost_alt_winapi.h +++ b/src/core/system/platform/shmipc/boost_alt_winapi.h @@ -24,6 +24,7 @@ # pragma once #endif +#include #include #include #include @@ -37,7 +38,7 @@ #include #ifdef BOOST_USE_WINDOWS_H -#include +#include #include #include #include diff --git a/src/core/system/platform/shmipc/shmipc.cpp b/src/core/system/platform/shmipc/shmipc.cpp index 14755d4e69..77df6884b5 100644 --- a/src/core/system/platform/shmipc/shmipc.cpp +++ b/src/core/system/platform/shmipc/shmipc.cpp @@ -4,12 +4,13 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #if BOOST_VERSION <= 105600 && defined(_WIN32) #define BOOST_INTERPROCESS_WIN32_PRIMITIVES_HPP diff --git a/src/core/system/platform/shmipc/shmipc.hpp b/src/core/system/platform/shmipc/shmipc.hpp index 144ff6453b..603d9b94ad 100644 --- a/src/core/system/platform/shmipc/shmipc.hpp +++ b/src/core/system/platform/shmipc/shmipc.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/system/platform/shmipc/shmipc_garbage_collect.cpp b/src/core/system/platform/shmipc/shmipc_garbage_collect.cpp index d3b74324cc..bdc71461bc 100644 --- a/src/core/system/platform/shmipc/shmipc_garbage_collect.cpp +++ b/src/core/system/platform/shmipc/shmipc_garbage_collect.cpp @@ -4,10 +4,11 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include -#include +#include #include #if BOOST_VERSION <= 105600 && defined(_WIN32) diff --git a/src/core/system/platform/shmipc/shmipc_garbage_collect.hpp b/src/core/system/platform/shmipc/shmipc_garbage_collect.hpp index 455f528980..af7055c460 100644 --- a/src/core/system/platform/shmipc/shmipc_garbage_collect.hpp +++ b/src/core/system/platform/shmipc/shmipc_garbage_collect.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SHMIPC_GARBAGE_COLLECT_HPP #define TURI_SHMIPC_GARBAGE_COLLECT_HPP #include +#include namespace turi { namespace shmipc { diff --git a/src/core/system/platform/so_utils/so_utils.cpp b/src/core/system/platform/so_utils/so_utils.cpp new file mode 100644 index 0000000000..9455d20de6 --- /dev/null +++ b/src/core/system/platform/so_utils/so_utils.cpp @@ -0,0 +1,129 @@ +/* Copyright © 2017 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + */ +#include +#include +#include + +#ifdef __APPLE__ +#include +#else +#include +#endif + + +namespace turi { + +namespace so_util { + + +#ifdef __APPLE__ +so_handle open_shared_library(const std::string& path) { + so_handle ret; + void* handle_ptr = dlopen(path.c_str(), RTLD_NOW | RTLD_LOCAL); + if (handle_ptr == NULL) { + std::string err (dlerror()); + log_and_throw(std::string("Cannot load shared library. Path: ") + path + " Error: " + err); + } + ret = {path, handle_ptr, NULL}; + size_t size = _dyld_image_count(); + for (size_t i = 0; i < size; ++i) { + if(strcmp(_dyld_get_image_name(i), ret.path.c_str()) == 0) { + ret.base_ptr = (void*)(_dyld_get_image_header(i)); + } + } + if (ret.base_ptr == NULL) { + log_and_throw(std::string("Cannot get base address of the shared library. Path: ") + path); + } + return ret; +} +#else +/** + * \internal + * + * Callback function passed to dl_iterate_phdr. + * + * \param data is type so_handle*, pointer to the target so_handle which + * we want to set its base_address. + * + * dl_iterate_phdr will iterate over all opened shared library, find + * one with dlpi_name equal to the so_handle.path and set the handle's base_ptr + * to dlpi_addr. + */ +int set_base_addr_callback(struct dl_phdr_info *info, size_t size, void *data) { + so_handle* handle = (so_handle*)(data); + if (strcmp(info->dlpi_name, handle->path.c_str()) == 0) { + handle->base_ptr = (void*)info->dlpi_addr; + } + return 0; +} + +so_handle open_shared_library(const std::string& path) { + so_handle ret; + void* handle_ptr = dlopen(path.c_str(), RTLD_NOW | RTLD_LOCAL); + if (handle_ptr == NULL) { + std::string err (dlerror()); + log_and_throw(std::string("Cannot load shared library. Path: ") + path + " Error: " + err); + } + ret = {path, handle_ptr, NULL}; + dl_iterate_phdr(set_base_addr_callback, &ret); + if (ret.base_ptr == NULL) { + log_and_throw(std::string("Cannot get base address of the shared library. Path: ") + path); + } + return ret; +} +#endif + +void close_shared_library(const so_handle& so) { + if (dlclose(so.handle_ptr) != 0) { + std::string err (dlerror()); + log_and_throw(std::string("Cannot close shared library. Path: ") + so.path+ " Error: " + err); + } +} + +size_t get_function_offset(const so_handle& so, const char* function_symbol){ + Dl_info info; + void* fptr = dlsym(so.handle_ptr, function_symbol); + if (fptr == NULL) { + log_and_throw(std::string("Cannot find function ") + function_symbol); + } + + // check dladdr return. dladdr returns 0 when failed + int success = dladdr((void*)(fptr), &info); + if (!success) { + log_and_throw(std::string("dladdr failed. ") + dlerror()); + } + + ASSERT_TRUE((char*)so.base_ptr == (char*)info.dli_fbase); + ASSERT_TRUE(info.dli_sname != NULL && info.dli_saddr != NULL); + ASSERT_TRUE((char*)fptr == (char*)info.dli_saddr); + + return (char*)(info.dli_saddr) - (char*)(info.dli_fbase); +} + +void* get_function_from_offset(const so_handle& so, size_t offset) { + Dl_info info; + void* fptr = (char*)so.base_ptr + offset; + + // Verify the function pointer is a valid symbol address. + // We do this by lookup the address of the assumed pointer using dladdr. + int success = dladdr((void*)(fptr), &info); + if (!success) { + log_and_throw(std::string("dladdr failed. ") + dlerror()); + } + + ASSERT_TRUE((char*)so.base_ptr == (char*)info.dli_fbase); + + // Function pointer may not have symbol, e.g. anonymous function (lambda) + bool has_symbol = info.dli_saddr != NULL; + // throw if pointer lookup succeed but different from query pointer. + if (has_symbol && (char*)fptr != (char*)info.dli_saddr) { + log_and_throw(std::string("Invalid function offset")); + }; + return fptr; +} + +} +} diff --git a/src/core/system/platform/so_utils/so_utils.hpp b/src/core/system/platform/so_utils/so_utils.hpp new file mode 100644 index 0000000000..a3842d9e1e --- /dev/null +++ b/src/core/system/platform/so_utils/so_utils.hpp @@ -0,0 +1,73 @@ +/* Copyright © 2017 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + */ +#ifndef TURI_DISTRIBUTED_SO_UTILS +#define TURI_DISTRIBUTED_SO_UTILS + +#include +#include +#include +#include + +namespace turi { +/** + * \defgroup soutils Shared Library Utilities + * Mac/Linux Shared Library manipulation utilities + */ + +/** + * \ingroup soutils + * Wrapping of dynamic library syscalls + */ +namespace so_util { + +struct so_handle { + // absolute path on the local filesystem to the shared library file + std::string path; + // the handle pointer returned by dlopen + void* handle_ptr; + // the base address at which the shared library is loaded. + void* base_ptr; +}; + +/** + * Try dlopen a shared library and return a so_handle. + * + * The path must be absolute path on the local filesystem. + * + * Raise std::string exception if it cannot be loaded. + */ +so_handle open_shared_library(const std::string& path); + +/** + * Try dlclose a shared library. + * + * Raise std::string exception if it cannot be closed. + */ +void close_shared_library(const so_handle& so); + +/** + * Returns the offset from the function_symbol to the base address of the shared library. + * + * function_symbol must be the mangled version. + * + * Raise std::string exception if symbol cannot be found or library does not contain + * the reference function. + */ +size_t get_function_offset(const so_handle& so, const char* function_symbol); + + +/** + * Returns the function pointer from given so_handle and offset. + * + * The so.base_ptr + offset must point to a valid symbol address. + * + * Raise std::string exception on error. + */ +void* get_function_from_offset(const so_handle& so, size_t offset); + +} +} +#endif diff --git a/src/core/system/platform/timer/CMakeLists.txt b/src/core/system/platform/timer/CMakeLists.txt deleted file mode 100644 index aee7ac1602..0000000000 --- a/src/core/system/platform/timer/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -project(Turi) - -#/**************************************************************************/ -#/* */ -#/* Random Library */ -#/* */ -#/**************************************************************************/ - -make_library(timer OBJECT - SOURCES - timer.cpp - REQUIRES - parallel - boost - EXTERNAL_VISIBILITY -) diff --git a/src/core/system/platform/timer/timer.cpp b/src/core/system/platform/timer/timer.cpp index 62e15410cf..3ae14ca9ed 100644 --- a/src/core/system/platform/timer/timer.cpp +++ b/src/core/system/platform/timer/timer.cpp @@ -4,11 +4,12 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include #include -#include +#include std::ostream& operator<<(std::ostream& out, const turi::timer& t) { return out << t.current_time(); diff --git a/src/core/system/platform/timer/timer.hpp b/src/core/system/platform/timer/timer.hpp index 70683314ba..74f040b452 100644 --- a/src/core/system/platform/timer/timer.hpp +++ b/src/core/system/platform/timer/timer.hpp @@ -7,6 +7,7 @@ #define TURI_TIMER_HPP #ifndef _MSC_VER +#include #include #endif @@ -31,7 +32,7 @@ namespace turi { * For example: * * \code - * #include + * #include * * * turi::timer timer; diff --git a/src/core/system/startup_teardown/CMakeLists.txt b/src/core/system/startup_teardown/CMakeLists.txt deleted file mode 100644 index 0bfac3b079..0000000000 --- a/src/core/system/startup_teardown/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -project(Turi) - -make_library(startup_teardown OBJECT - SOURCES - startup_teardown.cpp - REQUIRES - logger fileio parallel timer random crash_handler pylambda -) diff --git a/src/core/system/startup_teardown/startup_teardown.cpp b/src/core/system/startup_teardown/startup_teardown.cpp index 3dbfd8c36f..d1a8c27079 100644 --- a/src/core/system/startup_teardown/startup_teardown.cpp +++ b/src/core/system/startup_teardown/startup_teardown.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifdef HAS_TCMALLOC #include @@ -12,7 +13,7 @@ #include #endif #ifndef _WIN32 -#include +#include #include #endif #include @@ -33,7 +34,7 @@ #include #include #endif -#include +#include #include "startup_teardown.hpp" diff --git a/src/core/system/startup_teardown/startup_teardown.hpp b/src/core/system/startup_teardown/startup_teardown.hpp index 469413b785..5f32f2ec2d 100644 --- a/src/core/system/startup_teardown/startup_teardown.hpp +++ b/src/core/system/startup_teardown/startup_teardown.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_STARTUP_TEARDOWN_HPP #define TURI_STARTUP_TEARDOWN_HPP +#include #include #include diff --git a/src/core/util/CMakeLists.txt b/src/core/util/CMakeLists.txt deleted file mode 100644 index a8dc4ccb0e..0000000000 --- a/src/core/util/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -project(Turi) - -make_library(util OBJECT - SOURCES - any.cpp - cityhash_tc.cpp - fs_util.cpp - md5.cpp - safe_circular_char_buffer.cpp - testing_utils.cpp - web_util.cpp - string_util.cpp - syserr_reporting.cpp - REQUIRES - logger - flexible_type - boost - EXTERNAL_VISIBILITY -) diff --git a/src/core/util/any.cpp b/src/core/util/any.cpp index 87e5067b0f..2cfcee385a 100644 --- a/src/core/util/any.cpp +++ b/src/core/util/any.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/util/any.hpp b/src/core/util/any.hpp index cc732a2b77..88a8c4f589 100644 --- a/src/core/util/any.hpp +++ b/src/core/util/any.hpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/src/core/util/basic_types.hpp b/src/core/util/basic_types.hpp index 20ba0fa5a3..7883e501a3 100644 --- a/src/core/util/basic_types.hpp +++ b/src/core/util/basic_types.hpp @@ -7,6 +7,7 @@ #ifndef TURI_BASIC_TYPES_H_ #define TURI_BASIC_TYPES_H_ +#include #include #include diff --git a/src/core/util/bitops.hpp b/src/core/util/bitops.hpp index d12e4b409c..c77bc32d13 100644 --- a/src/core/util/bitops.hpp +++ b/src/core/util/bitops.hpp @@ -6,6 +6,7 @@ #ifndef TURI_BITOPS_H #define TURI_BITOPS_H +#include #include #include #include diff --git a/src/core/util/blocking_queue.hpp b/src/core/util/blocking_queue.hpp index 395db67172..2dd63f3ac3 100644 --- a/src/core/util/blocking_queue.hpp +++ b/src/core/util/blocking_queue.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/core/util/boost_property_tree_utils.hpp b/src/core/util/boost_property_tree_utils.hpp index 2a7ca724f8..73f1224281 100644 --- a/src/core/util/boost_property_tree_utils.hpp +++ b/src/core/util/boost_property_tree_utils.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/util/branch_hints.hpp b/src/core/util/branch_hints.hpp index 21f7cdc74a..8ca9b4c29a 100644 --- a/src/core/util/branch_hints.hpp +++ b/src/core/util/branch_hints.hpp @@ -35,3 +35,4 @@ #define __unlikely__(x) __builtin_expect((x),0) #endif //TURI_UTIL_BRANCH_HINTS_HPP +#include diff --git a/src/core/util/buffer_pool.hpp b/src/core/util/buffer_pool.hpp index cc93ed5c8b..dd5b60eeca 100644 --- a/src/core/util/buffer_pool.hpp +++ b/src/core/util/buffer_pool.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/util/charstream.hpp b/src/core/util/charstream.hpp index 66a3798ae7..7ba5407f99 100644 --- a/src/core/util/charstream.hpp +++ b/src/core/util/charstream.hpp @@ -6,6 +6,7 @@ #ifndef TURI_CHARSTREAM #define TURI_CHARSTREAM +#include #include #include diff --git a/src/core/util/cityhash_tc.cpp b/src/core/util/cityhash_tc.cpp index 95ef544655..56b24fc181 100644 --- a/src/core/util/cityhash_tc.cpp +++ b/src/core/util/cityhash_tc.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/util/cityhash_tc.hpp b/src/core/util/cityhash_tc.hpp index 19e14a77d6..41883b85e1 100644 --- a/src/core/util/cityhash_tc.hpp +++ b/src/core/util/cityhash_tc.hpp @@ -7,6 +7,7 @@ #define TURI_CITYHASH_GL_H_ #include +#include #include // Copyright (c) 2011 Google, Inc. diff --git a/src/core/util/code_optimization.hpp b/src/core/util/code_optimization.hpp index 6d61a654e4..f1fbfd0974 100644 --- a/src/core/util/code_optimization.hpp +++ b/src/core/util/code_optimization.hpp @@ -91,6 +91,7 @@ __attribute__((cold, noinline, noreturn)) #ifdef __SSE2__ +#include #include #endif diff --git a/src/core/util/coro.hpp b/src/core/util/coro.hpp index 02a1675adb..c632fdc92f 100644 --- a/src/core/util/coro.hpp +++ b/src/core/util/coro.hpp @@ -133,3 +133,4 @@ #define CLASS_CORO_RUNNING(obj, f) ((obj)._coro_state ##f != 0) #endif +#include diff --git a/src/core/util/dense_bitset.hpp b/src/core/util/dense_bitset.hpp index f6a85e2c69..7d5b24c2b3 100644 --- a/src/core/util/dense_bitset.hpp +++ b/src/core/util/dense_bitset.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/util/dot_graph_printer/CMakeLists.txt b/src/core/util/dot_graph_printer/CMakeLists.txt deleted file mode 100644 index 7cf2ccb960..0000000000 --- a/src/core/util/dot_graph_printer/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -project(Turi) diff --git a/src/core/util/dot_graph_printer/dot_graph.hpp b/src/core/util/dot_graph_printer/dot_graph.hpp index 1f71703211..21737c0d88 100644 --- a/src/core/util/dot_graph_printer/dot_graph.hpp +++ b/src/core/util/dot_graph_printer/dot_graph.hpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace turi { class dot_graph { public: diff --git a/src/core/util/fast_integer_power.hpp b/src/core/util/fast_integer_power.hpp index 6e398e1f01..2128459463 100644 --- a/src/core/util/fast_integer_power.hpp +++ b/src/core/util/fast_integer_power.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/src/core/util/fast_top_k.hpp b/src/core/util/fast_top_k.hpp index a87724f3b5..375226bf6c 100644 --- a/src/core/util/fast_top_k.hpp +++ b/src/core/util/fast_top_k.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace turi { diff --git a/src/core/util/file_line_count_estimator.hpp b/src/core/util/file_line_count_estimator.hpp index 99a5d5fb35..bec1463b80 100644 --- a/src/core/util/file_line_count_estimator.hpp +++ b/src/core/util/file_line_count_estimator.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_FILE_LINE_COUNT_ESTIMATOR_HPP #define TURI_UNITY_FILE_LINE_COUNT_ESTIMATOR_HPP #include +#include namespace turi { /** diff --git a/src/core/util/fs_util.cpp b/src/core/util/fs_util.cpp index 3d9e19b5f3..7fbcf060c0 100644 --- a/src/core/util/fs_util.cpp +++ b/src/core/util/fs_util.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/util/fs_util.hpp b/src/core/util/fs_util.hpp index 975fbb1dbe..431dae67b9 100644 --- a/src/core/util/fs_util.hpp +++ b/src/core/util/fs_util.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/core/util/function_output_iterator.hpp b/src/core/util/function_output_iterator.hpp index 98e28d4d7f..2ee8f758f8 100644 --- a/src/core/util/function_output_iterator.hpp +++ b/src/core/util/function_output_iterator.hpp @@ -17,6 +17,7 @@ #define TURI_FUNCTION_OUTPUT_ITERATOR_HPP #include +#include namespace turi { diff --git a/src/core/util/hash_value.hpp b/src/core/util/hash_value.hpp index a57801086a..87b0435de4 100644 --- a/src/core/util/hash_value.hpp +++ b/src/core/util/hash_value.hpp @@ -6,6 +6,7 @@ #ifndef TURI_HASH_VALUE_H_ #define TURI_HASH_VALUE_H_ +#include #include #include #include diff --git a/src/core/util/int128_types.hpp b/src/core/util/int128_types.hpp index 0114ee1b2f..ac9dfc4e9b 100644 --- a/src/core/util/int128_types.hpp +++ b/src/core/util/int128_types.hpp @@ -15,6 +15,7 @@ */ #ifndef _INT128_TYPES_H_ #define _INT128_TYPES_H_ +#include #include #include #include diff --git a/src/core/util/logit_math.hpp b/src/core/util/logit_math.hpp index f5b67e9e4b..1e0a1f369c 100644 --- a/src/core/util/logit_math.hpp +++ b/src/core/util/logit_math.hpp @@ -7,6 +7,7 @@ #define TURI_LOGIT_MATH_H_ +#include #include #include #include diff --git a/src/core/util/lru.hpp b/src/core/util/lru.hpp index 43bb40d1af..e758505484 100644 --- a/src/core/util/lru.hpp +++ b/src/core/util/lru.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/core/util/md5.cpp b/src/core/util/md5.cpp index a240b3ebaf..7f0197ec84 100644 --- a/src/core/util/md5.cpp +++ b/src/core/util/md5.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include namespace turi { // source from wikipedia: https://en.wikipedia.org/wiki/MD5#Algorithm diff --git a/src/core/util/md5.hpp b/src/core/util/md5.hpp index 7292925b56..a00fa90ed6 100644 --- a/src/core/util/md5.hpp +++ b/src/core/util/md5.hpp @@ -6,6 +6,7 @@ #ifndef UTIL_MD5_HPP #define UTIL_MD5_HPP #include +#include namespace turi { /** diff --git a/src/core/util/mutable_queue.hpp b/src/core/util/mutable_queue.hpp index 56a54fb4f1..34eb334a1d 100644 --- a/src/core/util/mutable_queue.hpp +++ b/src/core/util/mutable_queue.hpp @@ -26,6 +26,7 @@ #include #include #include +#include #include namespace turi { diff --git a/src/core/util/resizing_array_sink.hpp b/src/core/util/resizing_array_sink.hpp index e6163c2d56..a76a1b3148 100644 --- a/src/core/util/resizing_array_sink.hpp +++ b/src/core/util/resizing_array_sink.hpp @@ -6,6 +6,7 @@ #ifndef TURI_RESIZING_COUNTING_SINK #define TURI_RESIZING_COUNTING_SINK +#include #include namespace turi { diff --git a/src/core/util/safe_circular_char_buffer.cpp b/src/core/util/safe_circular_char_buffer.cpp index a64803eba0..a3223655a5 100644 --- a/src/core/util/safe_circular_char_buffer.cpp +++ b/src/core/util/safe_circular_char_buffer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/util/safe_circular_char_buffer.hpp b/src/core/util/safe_circular_char_buffer.hpp index a884dfee16..1a4bc425aa 100644 --- a/src/core/util/safe_circular_char_buffer.hpp +++ b/src/core/util/safe_circular_char_buffer.hpp @@ -5,6 +5,7 @@ */ #ifndef SAFE_CIRCULAR_CHAR_BUFFER_HPP #define SAFE_CIRCULAR_CHAR_BUFFER_HPP +#include #include #include diff --git a/src/core/util/stl_util.hpp b/src/core/util/stl_util.hpp index edfff3f1d0..c9118ede2a 100644 --- a/src/core/util/stl_util.hpp +++ b/src/core/util/stl_util.hpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/core/util/string_util.cpp b/src/core/util/string_util.cpp index c16a110c4a..788f9e0898 100644 --- a/src/core/util/string_util.cpp +++ b/src/core/util/string_util.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/core/util/string_util.hpp b/src/core/util/string_util.hpp index 136e7f4c2c..c3d322a057 100644 --- a/src/core/util/string_util.hpp +++ b/src/core/util/string_util.hpp @@ -10,6 +10,7 @@ #include #include #include +#include template std::vector strip_seq_prefix(const std::vector& v, const std::vector& tok) { std::vector ret; diff --git a/src/core/util/sys_util.hpp b/src/core/util/sys_util.hpp index 435b346e36..2d29a4deb8 100644 --- a/src/core/util/sys_util.hpp +++ b/src/core/util/sys_util.hpp @@ -32,3 +32,4 @@ #endif // Platform #endif +#include diff --git a/src/core/util/syserr_reporting.cpp b/src/core/util/syserr_reporting.cpp index 2fda5c17cd..7d8fe0e8c2 100644 --- a/src/core/util/syserr_reporting.cpp +++ b/src/core/util/syserr_reporting.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #ifdef _WIN32 -#include +#include #else #include #include diff --git a/src/core/util/syserr_reporting.hpp b/src/core/util/syserr_reporting.hpp index 7b42d67e8c..88d8e9efa0 100644 --- a/src/core/util/syserr_reporting.hpp +++ b/src/core/util/syserr_reporting.hpp @@ -7,6 +7,7 @@ #define TURI_SYSERR_REPORTING_H_ #include +#include /** * \ingroup util diff --git a/src/core/util/test_macros.hpp b/src/core/util/test_macros.hpp index c6c59928b3..5ebb579e71 100644 --- a/src/core/util/test_macros.hpp +++ b/src/core/util/test_macros.hpp @@ -7,6 +7,7 @@ #define TEST_MACROS_HPP #include +#include static std::recursive_mutex __b_lock__; #define _TS_ADD_LOCK_GUARD std::lock_guard __guard_b__(__b_lock__) diff --git a/src/core/util/testing_utils.cpp b/src/core/util/testing_utils.cpp index 66307baf74..77324950c3 100644 --- a/src/core/util/testing_utils.cpp +++ b/src/core/util/testing_utils.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/core/util/testing_utils.hpp b/src/core/util/testing_utils.hpp index 15bffa518b..7666a93d9a 100644 --- a/src/core/util/testing_utils.hpp +++ b/src/core/util/testing_utils.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GENERAL_TESTING_UTILS_H_ #define TURI_GENERAL_TESTING_UTILS_H_ +#include #include #include #include diff --git a/src/core/util/try_finally.hpp b/src/core/util/try_finally.hpp index a709191cca..406a656540 100644 --- a/src/core/util/try_finally.hpp +++ b/src/core/util/try_finally.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/core/util/web_util.cpp b/src/core/util/web_util.cpp index e28707fcd7..3e1f2ca175 100644 --- a/src/core/util/web_util.cpp +++ b/src/core/util/web_util.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/core/util/web_util.hpp b/src/core/util/web_util.hpp index 4e9b952ffd..c03b2ca9ea 100644 --- a/src/core/util/web_util.hpp +++ b/src/core/util/web_util.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/deployment/AudioPreprocessing.h b/src/deployment/AudioPreprocessing.h index 2beaf4d0b6..1fb47fdcce 100644 --- a/src/deployment/AudioPreprocessing.h +++ b/src/deployment/AudioPreprocessing.h @@ -25,3 +25,4 @@ API_AVAILABLE(macos(10.13),ios(11.0)) @end NS_ASSUME_NONNULL_END +#include diff --git a/src/deployment/TuriCreateObjC.h b/src/deployment/TuriCreateObjC.h index 32e12de139..38f6591646 100644 --- a/src/deployment/TuriCreateObjC.h +++ b/src/deployment/TuriCreateObjC.h @@ -5,6 +5,7 @@ */ #import #import +#include #include // @TODO: think about side data later diff --git a/src/deployment/recommender_initialization.cpp b/src/deployment/recommender_initialization.cpp index 5d6570ef6f..575d8c369c 100644 --- a/src/deployment/recommender_initialization.cpp +++ b/src/deployment/recommender_initialization.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/external/Eigen/CMakeLists.txt b/src/external/Eigen/CMakeLists.txt index 9ad7bc1b16..69c9942ecc 100644 --- a/src/external/Eigen/CMakeLists.txt +++ b/src/external/Eigen/CMakeLists.txt @@ -1,4 +1,3 @@ project(Turi) add_library(eigen INTERFACE) -target_compile_definitions(eigen INTERFACE EIGEN_MPL2_ONLY) diff --git a/src/external/coremltools_wrap/CMakeLists.txt b/src/external/coremltools_wrap/CMakeLists.txt index 11877d9fc3..a06e9188b5 100644 --- a/src/external/coremltools_wrap/CMakeLists.txt +++ b/src/external/coremltools_wrap/CMakeLists.txt @@ -10,13 +10,14 @@ file(GLOB_RECURSE _mlmodel_files ${CMAKE_CURRENT_SOURCE_DIR}/coremltools/mlmodel/src/*.cpp) make_library(coremltools_mlmodel - OBJECT SOURCES ${_mlmodel_files} REQUIRES protobuf EXTERNAL_VISIBILITY ) -target_compile_options(coremltools_mlmodel INTERFACE "-w -DCoreML=__tc_coreml") +target_compile_options(coremltools_mlmodel PRIVATE "-w") + +target_compile_options(coremltools_mlmodel PUBLIC "-DCoreML=__tc_coreml") diff --git a/src/external/google/protobuf/CMakeLists.txt b/src/external/google/protobuf/CMakeLists.txt index dc65ba8d03..0080b4b876 100644 --- a/src/external/google/protobuf/CMakeLists.txt +++ b/src/external/google/protobuf/CMakeLists.txt @@ -1,7 +1,6 @@ -project(TuriExternalDependencies) +project(Turi) make_library(protobuf - OBJECT SOURCES # Don't need to pull in the compiler source files here. # Or any non-lite sources. @@ -27,4 +26,4 @@ make_library(protobuf stubs/structurally_valid.cc stubs/strutil.cc wire_format_lite.cc -) \ No newline at end of file +) diff --git a/src/external/libjson/CMakeLists.txt b/src/external/libjson/CMakeLists.txt index d8c92fffbe..58dc0bc193 100644 --- a/src/external/libjson/CMakeLists.txt +++ b/src/external/libjson/CMakeLists.txt @@ -1,7 +1,6 @@ project(Turi) make_library(libjson - OBJECT SOURCES Source/internalJSONNode.cpp Source/JSONNode_Mutex.cpp diff --git a/src/external/lz4/CMakeLists.txt b/src/external/lz4/CMakeLists.txt index be9b974fc9..dadc6ce1f3 100644 --- a/src/external/lz4/CMakeLists.txt +++ b/src/external/lz4/CMakeLists.txt @@ -1,3 +1,3 @@ project(Turi) -make_library(lz4 OBJECT SOURCES lz4.c lz4hc.c) +make_library(lz4 SOURCES lz4.c lz4hc.c) diff --git a/src/external/uuid_p/CMakeLists.txt b/src/external/uuid_p/CMakeLists.txt index c88c3c427a..09135a938d 100644 --- a/src/external/uuid_p/CMakeLists.txt +++ b/src/external/uuid_p/CMakeLists.txt @@ -1,6 +1,6 @@ project(Turi) -make_library(uuid OBJECT +make_library(uuid SOURCES clear.c compare.c copy.c gen_uuid.c isnull.c pack.c parse.c unpack.c unparse.c uuid_time.c randutils.c ) diff --git a/src/external/xgboost/CMakeLists.txt b/src/external/xgboost/CMakeLists.txt index d6c8b30dbc..0097850a08 100644 --- a/src/external/xgboost/CMakeLists.txt +++ b/src/external/xgboost/CMakeLists.txt @@ -1,6 +1,6 @@ project(Turi) -make_library(xgboost OBJECT +make_library(xgboost SOURCES src/gbm/gbm.cpp src/tree/updater.cpp @@ -12,5 +12,5 @@ make_library(xgboost OBJECT boost ) -target_compile_options(xgboost PUBLIC "-Wno-narrowing -msse2 -funroll-loops") +target_compile_options(xgboost PUBLIC "-Wno-narrowing -funroll-loops") target_compile_definitions(xgboost PUBLIC "-DXGBOOST_CUSTOMIZE_MSG_") diff --git a/src/external/xgboost/src/gbm/gbm.h b/src/external/xgboost/src/gbm/gbm.h index 41bf76a0ee..2f7465f101 100644 --- a/src/external/xgboost/src/gbm/gbm.h +++ b/src/external/xgboost/src/gbm/gbm.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace xgboost { diff --git a/src/external/xgboost/src/io/dmlc_simple.cpp b/src/external/xgboost/src/io/dmlc_simple.cpp index da1817f5b8..4fa68b9005 100644 --- a/src/external/xgboost/src/io/dmlc_simple.cpp +++ b/src/external/xgboost/src/io/dmlc_simple.cpp @@ -3,7 +3,7 @@ #define _CRT_SECURE_NO_DEPRECATE #define NOMINMAX #include -#include +#include // implements a single no split version of DMLC // in case we want to avoid dependency on dmlc-core diff --git a/src/external/xgboost/src/io/io.cpp b/src/external/xgboost/src/io/io.cpp index 8a9c14ee04..a029efe4a1 100644 --- a/src/external/xgboost/src/io/io.cpp +++ b/src/external/xgboost/src/io/io.cpp @@ -3,7 +3,7 @@ #define _CRT_SECURE_NO_DEPRECATE #define NOMINMAX #include -#include +#include #include #include "io.h" #include "simple_dmatrix-inl.hpp" diff --git a/src/external/xgboost/src/learner/dmatrix.h b/src/external/xgboost/src/learner/dmatrix.h index f2b383adbb..39fa2f6ee3 100644 --- a/src/external/xgboost/src/learner/dmatrix.h +++ b/src/external/xgboost/src/learner/dmatrix.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace xgboost { namespace learner { /*! diff --git a/src/external/xgboost/src/learner/learner-inl.hpp b/src/external/xgboost/src/learner/learner-inl.hpp index 915e37eb0e..c68a3da226 100644 --- a/src/external/xgboost/src/learner/learner-inl.hpp +++ b/src/external/xgboost/src/learner/learner-inl.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include "./objective.h" #include "./evaluation.h" diff --git a/src/external/xgboost/src/tree/model.h b/src/external/xgboost/src/tree/model.h index 9e06414710..8d1ffeaada 100644 --- a/src/external/xgboost/src/tree/model.h +++ b/src/external/xgboost/src/tree/model.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/external/xgboost/src/tree/updater_distcol-inl.hpp b/src/external/xgboost/src/tree/updater_distcol-inl.hpp index 67144353a3..4923112d17 100644 --- a/src/external/xgboost/src/tree/updater_distcol-inl.hpp +++ b/src/external/xgboost/src/tree/updater_distcol-inl.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "./updater_colmaker-inl.hpp" #include "./updater_prune-inl.hpp" diff --git a/src/external/xgboost/src/xgboost_main.cpp b/src/external/xgboost/src/xgboost_main.cpp index 773001503b..861c0f2012 100644 --- a/src/external/xgboost/src/xgboost_main.cpp +++ b/src/external/xgboost/src/xgboost_main.cpp @@ -7,7 +7,7 @@ #include #include #include "./sync/sync.h" -#include "./io/io.h" +#include #include "./utils/utils.h" #include "./utils/config.h" #include "./learner/learner-inl.hpp" diff --git a/src/external/xgboost/subtree/rabit/include/rabit_serializable.h b/src/external/xgboost/subtree/rabit/include/rabit_serializable.h index c9199bba12..a18b9021dc 100644 --- a/src/external/xgboost/subtree/rabit/include/rabit_serializable.h +++ b/src/external/xgboost/subtree/rabit/include/rabit_serializable.h @@ -9,7 +9,7 @@ #include #include #include "./rabit/utils.h" -#include "./dmlc/io.h" +#include namespace rabit { /*! diff --git a/src/external/xgboost/subtree/rabit/src/allreduce_robust.cc b/src/external/xgboost/subtree/rabit/src/allreduce_robust.cc index 1757518429..0d517db074 100644 --- a/src/external/xgboost/subtree/rabit/src/allreduce_robust.cc +++ b/src/external/xgboost/subtree/rabit/src/allreduce_robust.cc @@ -10,7 +10,7 @@ #define NOMINMAX #include #include -#include "../include/rabit/io.h" +#include #include "../include/rabit/utils.h" #include "../include/rabit/engine.h" #include "../include/rabit/rabit-inl.h" diff --git a/src/external/xgboost/wrapper/xgboost_wrapper.cpp b/src/external/xgboost/wrapper/xgboost_wrapper.cpp index 6d547fe183..48b4de6c61 100644 --- a/src/external/xgboost/wrapper/xgboost_wrapper.cpp +++ b/src/external/xgboost/wrapper/xgboost_wrapper.cpp @@ -14,7 +14,7 @@ using namespace std; #include "./xgboost_wrapper.h" #include "../src/data.h" #include "../src/learner/learner-inl.hpp" -#include "../src/io/io.h" +#include #include "../src/utils/utils.h" #include "../src/utils/math.h" #include "../src/utils/group_data.h" diff --git a/src/ml/CMakeLists.txt b/src/ml/CMakeLists.txt deleted file mode 100644 index 1534f7370c..0000000000 --- a/src/ml/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -subdirs(ml_data -neural_net -optimization -sketches) diff --git a/src/toolkits/coreml_export/coreml_export_utils.cpp b/src/ml/coreml_export/coreml_export_utils.cpp similarity index 91% rename from src/toolkits/coreml_export/coreml_export_utils.cpp rename to src/ml/coreml_export/coreml_export_utils.cpp index 3fb45bff91..98360a0b71 100644 --- a/src/toolkits/coreml_export/coreml_export_utils.cpp +++ b/src/ml/coreml_export/coreml_export_utils.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include -#include "toolkits/coreml_export/mlmodel_include.hpp" +#include namespace turi { diff --git a/src/toolkits/coreml_export/coreml_export_utils.hpp b/src/ml/coreml_export/coreml_export_utils.hpp similarity index 90% rename from src/toolkits/coreml_export/coreml_export_utils.hpp rename to src/ml/coreml_export/coreml_export_utils.hpp index ad2ac162ab..bd3ee41735 100644 --- a/src/toolkits/coreml_export/coreml_export_utils.hpp +++ b/src/ml/coreml_export/coreml_export_utils.hpp @@ -6,7 +6,8 @@ #ifndef COREML_EXPORT_UTILS_HPP #define COREML_EXPORT_UTILS_HPP #include -#include +#include +#include #include namespace turi { diff --git a/src/toolkits/coreml_export/linear_models_exporter.cpp b/src/ml/coreml_export/linear_models_exporter.cpp similarity index 97% rename from src/toolkits/coreml_export/linear_models_exporter.cpp rename to src/ml/coreml_export/linear_models_exporter.cpp index 8e8067a0fb..b92e7c865c 100644 --- a/src/toolkits/coreml_export/linear_models_exporter.cpp +++ b/src/ml/coreml_export/linear_models_exporter.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/coreml_export/linear_models_exporter.hpp b/src/ml/coreml_export/linear_models_exporter.hpp similarity index 96% rename from src/toolkits/coreml_export/linear_models_exporter.hpp rename to src/ml/coreml_export/linear_models_exporter.hpp index 474fe69f41..233c0d51d5 100644 --- a/src/toolkits/coreml_export/linear_models_exporter.hpp +++ b/src/ml/coreml_export/linear_models_exporter.hpp @@ -10,9 +10,10 @@ #include #include +#include #include #include -#include +#include namespace turi { diff --git a/src/toolkits/coreml_export/mldata_exporter.cpp b/src/ml/coreml_export/mldata_exporter.cpp similarity index 98% rename from src/toolkits/coreml_export/mldata_exporter.cpp rename to src/ml/coreml_export/mldata_exporter.cpp index d564b6b9de..1d33842511 100644 --- a/src/toolkits/coreml_export/mldata_exporter.cpp +++ b/src/ml/coreml_export/mldata_exporter.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include namespace turi { diff --git a/src/toolkits/coreml_export/mldata_exporter.hpp b/src/ml/coreml_export/mldata_exporter.hpp similarity index 92% rename from src/toolkits/coreml_export/mldata_exporter.hpp rename to src/ml/coreml_export/mldata_exporter.hpp index 070e371b01..2ce1112024 100644 --- a/src/toolkits/coreml_export/mldata_exporter.hpp +++ b/src/ml/coreml_export/mldata_exporter.hpp @@ -6,7 +6,8 @@ #ifndef COREML_MLDATA_EXPORTER_HPP #define COREML_MLDATA_EXPORTER_HPP -#include +#include +#include #include namespace turi { diff --git a/src/toolkits/coreml_export/mlmodel_include.hpp b/src/ml/coreml_export/mlmodel_include.hpp similarity index 98% rename from src/toolkits/coreml_export/mlmodel_include.hpp rename to src/ml/coreml_export/mlmodel_include.hpp index 58a314d9e7..d418e1511d 100644 --- a/src/toolkits/coreml_export/mlmodel_include.hpp +++ b/src/ml/coreml_export/mlmodel_include.hpp @@ -23,6 +23,7 @@ #undef CHECK // Include this first. We need to undefine some defines here. +#include #include #include diff --git a/src/toolkits/coreml_export/mlmodel_wrapper.cpp b/src/ml/coreml_export/mlmodel_wrapper.cpp similarity index 75% rename from src/toolkits/coreml_export/mlmodel_wrapper.cpp rename to src/ml/coreml_export/mlmodel_wrapper.cpp index 95e82a2573..d8d531e33d 100644 --- a/src/toolkits/coreml_export/mlmodel_wrapper.cpp +++ b/src/ml/coreml_export/mlmodel_wrapper.cpp @@ -1,7 +1,8 @@ -#include +#include +#include -#include -#include +#include +#include namespace turi { namespace coreml { diff --git a/src/toolkits/coreml_export/mlmodel_wrapper.hpp b/src/ml/coreml_export/mlmodel_wrapper.hpp similarity index 97% rename from src/toolkits/coreml_export/mlmodel_wrapper.hpp rename to src/ml/coreml_export/mlmodel_wrapper.hpp index 1b0c1c0944..8d497db75e 100644 --- a/src/toolkits/coreml_export/mlmodel_wrapper.hpp +++ b/src/ml/coreml_export/mlmodel_wrapper.hpp @@ -3,6 +3,7 @@ #include +#include #include #include diff --git a/src/toolkits/coreml_export/neural_net_models_exporter.cpp b/src/ml/coreml_export/neural_net_models_exporter.cpp similarity index 99% rename from src/toolkits/coreml_export/neural_net_models_exporter.cpp rename to src/ml/coreml_export/neural_net_models_exporter.cpp index baee040c17..76a98ac904 100644 --- a/src/toolkits/coreml_export/neural_net_models_exporter.cpp +++ b/src/ml/coreml_export/neural_net_models_exporter.cpp @@ -4,13 +4,14 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include -#include +#include #include using CoreML::Specification::ArrayFeatureType; diff --git a/src/toolkits/coreml_export/neural_net_models_exporter.hpp b/src/ml/coreml_export/neural_net_models_exporter.hpp similarity index 97% rename from src/toolkits/coreml_export/neural_net_models_exporter.hpp rename to src/ml/coreml_export/neural_net_models_exporter.hpp index 71d2981623..cc20a3cee9 100644 --- a/src/toolkits/coreml_export/neural_net_models_exporter.hpp +++ b/src/ml/coreml_export/neural_net_models_exporter.hpp @@ -11,8 +11,10 @@ #include #include +#include #include #include +#include #include #include diff --git a/src/toolkits/coreml_export/xgboost_exporter.cpp b/src/ml/coreml_export/xgboost_exporter.cpp similarity index 97% rename from src/toolkits/coreml_export/xgboost_exporter.cpp rename to src/ml/coreml_export/xgboost_exporter.cpp index 081f2769db..d7e42224e6 100644 --- a/src/toolkits/coreml_export/xgboost_exporter.cpp +++ b/src/ml/coreml_export/xgboost_exporter.cpp @@ -3,12 +3,13 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include using turi::coreml::MLModelWrapper; diff --git a/src/toolkits/coreml_export/xgboost_exporter.hpp b/src/ml/coreml_export/xgboost_exporter.hpp similarity index 93% rename from src/toolkits/coreml_export/xgboost_exporter.hpp rename to src/ml/coreml_export/xgboost_exporter.hpp index b532442340..84f2028678 100644 --- a/src/toolkits/coreml_export/xgboost_exporter.hpp +++ b/src/ml/coreml_export/xgboost_exporter.hpp @@ -11,8 +11,9 @@ #include #include +#include #include -#include +#include namespace turi { diff --git a/src/toolkits/evaluation/evaluation_constants.hpp b/src/ml/evaluation/evaluation_constants.hpp similarity index 95% rename from src/toolkits/evaluation/evaluation_constants.hpp rename to src/ml/evaluation/evaluation_constants.hpp index b52edb3603..1a84821d59 100644 --- a/src/toolkits/evaluation/evaluation_constants.hpp +++ b/src/ml/evaluation/evaluation_constants.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_EVALUATION_CONSTANTS_HPP #define TURI_UNITY_EVALUATION_CONSTANTS_HPP #include +#include namespace turi { namespace evaluation { /** diff --git a/src/toolkits/evaluation/evaluation_interface-inl.hpp b/src/ml/evaluation/evaluation_interface-inl.hpp similarity index 99% rename from src/toolkits/evaluation/evaluation_interface-inl.hpp rename to src/ml/evaluation/evaluation_interface-inl.hpp index 5dcd156a11..a1678cf7af 100644 --- a/src/toolkits/evaluation/evaluation_interface-inl.hpp +++ b/src/ml/evaluation/evaluation_interface-inl.hpp @@ -6,6 +6,7 @@ #ifndef TURI_EVAL_INTERFACE_H_ #define TURI_EVAL_INTERFACE_H_ // Types +#include #include #include #include diff --git a/src/toolkits/evaluation/metrics.cpp b/src/ml/evaluation/metrics.cpp similarity index 98% rename from src/toolkits/evaluation/metrics.cpp rename to src/ml/evaluation/metrics.cpp index 86a670da00..6424549671 100644 --- a/src/toolkits/evaluation/metrics.cpp +++ b/src/ml/evaluation/metrics.cpp @@ -3,22 +3,23 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include -#include +#include // ML-Data #include // Evaluation -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include diff --git a/src/toolkits/evaluation/metrics.hpp b/src/ml/evaluation/metrics.hpp similarity index 96% rename from src/toolkits/evaluation/metrics.hpp rename to src/ml/evaluation/metrics.hpp index b36bceebc8..80101e78d6 100644 --- a/src/toolkits/evaluation/metrics.hpp +++ b/src/ml/evaluation/metrics.hpp @@ -9,12 +9,13 @@ #include #include +#include #include #include #include #include -#include -#include +#include +#include namespace turi { namespace evaluation { diff --git a/src/toolkits/evaluation/unity_evaluation.cpp b/src/ml/evaluation/unity_evaluation.cpp similarity index 95% rename from src/toolkits/evaluation/unity_evaluation.cpp rename to src/ml/evaluation/unity_evaluation.cpp index 2794c5dc73..ee7017bd58 100644 --- a/src/toolkits/evaluation/unity_evaluation.cpp +++ b/src/ml/evaluation/unity_evaluation.cpp @@ -7,6 +7,7 @@ //#include // Data structures +#include #include #include #include @@ -18,9 +19,9 @@ #include // Toolkits -#include -#include -#include +#include +#include +#include /// SDK diff --git a/src/toolkits/evaluation/unity_evaluation.hpp b/src/ml/evaluation/unity_evaluation.hpp similarity index 97% rename from src/toolkits/evaluation/unity_evaluation.hpp rename to src/ml/evaluation/unity_evaluation.hpp index 9bae2fadca..020b070a7b 100644 --- a/src/toolkits/evaluation/unity_evaluation.hpp +++ b/src/ml/evaluation/unity_evaluation.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_EVALUATION_H #define TURI_UNITY_EVALUATION_H +#include #include #include #include diff --git a/src/toolkits/factorization/als.hpp b/src/ml/factorization/als.hpp similarity index 99% rename from src/toolkits/factorization/als.hpp rename to src/ml/factorization/als.hpp index 8a459555a3..6d0ced3898 100644 --- a/src/toolkits/factorization/als.hpp +++ b/src/ml/factorization/als.hpp @@ -8,12 +8,13 @@ #include // ML-Data & options manager -#include +#include +#include #include #include // Factorization model impl -#include +#include #include diff --git a/src/toolkits/factorization/factorization_model.cpp b/src/ml/factorization/factorization_model.cpp similarity index 95% rename from src/toolkits/factorization/factorization_model.cpp rename to src/ml/factorization/factorization_model.cpp index 6f3547aeec..e2126b4d57 100644 --- a/src/toolkits/factorization/factorization_model.cpp +++ b/src/ml/factorization/factorization_model.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/factorization_model.hpp b/src/ml/factorization/factorization_model.hpp similarity index 99% rename from src/toolkits/factorization/factorization_model.hpp rename to src/ml/factorization/factorization_model.hpp index 0fe453f83f..f72c40e746 100644 --- a/src/toolkits/factorization/factorization_model.hpp +++ b/src/ml/factorization/factorization_model.hpp @@ -7,12 +7,13 @@ #define TURI_FACTORIZATION_MODEL_BASE_H_ #include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/src/toolkits/factorization/factorization_model_impl.hpp b/src/ml/factorization/factorization_model_impl.hpp similarity index 99% rename from src/toolkits/factorization/factorization_model_impl.hpp rename to src/ml/factorization/factorization_model_impl.hpp index 2e993d891d..a2065b9484 100644 --- a/src/toolkits/factorization/factorization_model_impl.hpp +++ b/src/ml/factorization/factorization_model_impl.hpp @@ -7,6 +7,7 @@ #define TURI_FACTORIZATION_GENERAL_LINEAR_MODEL_SECOND_ORDER_H_ #include +#include #include #include #include @@ -15,11 +16,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/toolkits/factorization/factorization_model_options.cpp b/src/ml/factorization/factorization_model_options.cpp similarity index 98% rename from src/toolkits/factorization/factorization_model_options.cpp rename to src/ml/factorization/factorization_model_options.cpp index ef5b67b0de..b7ff71303b 100644 --- a/src/toolkits/factorization/factorization_model_options.cpp +++ b/src/ml/factorization/factorization_model_options.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include -#include -#include -#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // Option handling for the factorization machine model diff --git a/src/toolkits/factorization/factorization_model_serialization.cpp b/src/ml/factorization/factorization_model_serialization.cpp similarity index 97% rename from src/toolkits/factorization/factorization_model_serialization.cpp rename to src/ml/factorization/factorization_model_serialization.cpp index 71ae77ac0d..2065f242d0 100644 --- a/src/toolkits/factorization/factorization_model_serialization.cpp +++ b/src/ml/factorization/factorization_model_serialization.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include +#include +#include #include #include #include diff --git a/src/toolkits/factorization/factorization_model_sgd_interface.hpp b/src/ml/factorization/factorization_model_sgd_interface.hpp similarity index 99% rename from src/toolkits/factorization/factorization_model_sgd_interface.hpp rename to src/ml/factorization/factorization_model_sgd_interface.hpp index 9be664f8ab..233d809ca5 100644 --- a/src/toolkits/factorization/factorization_model_sgd_interface.hpp +++ b/src/ml/factorization/factorization_model_sgd_interface.hpp @@ -7,6 +7,7 @@ #define TURI_FACTORIZATION_GLM_SGD_INTERFACE_H_ #include +#include #include #include #include @@ -15,8 +16,8 @@ #include #include -#include -#include +#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/factorization_model_training.cpp b/src/ml/factorization/factorization_model_training.cpp similarity index 91% rename from src/toolkits/factorization/factorization_model_training.cpp rename to src/ml/factorization/factorization_model_training.cpp index 1be74ddfd1..198a0cfdfe 100644 --- a/src/toolkits/factorization/factorization_model_training.cpp +++ b/src/ml/factorization/factorization_model_training.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/factors_to_sframe.hpp b/src/ml/factorization/factors_to_sframe.hpp similarity index 98% rename from src/toolkits/factorization/factors_to_sframe.hpp rename to src/ml/factorization/factors_to_sframe.hpp index bb194e33e2..0f0c86bc71 100644 --- a/src/toolkits/factorization/factors_to_sframe.hpp +++ b/src/ml/factorization/factors_to_sframe.hpp @@ -6,7 +6,8 @@ #ifndef TURI_FACTORIZATION_FACTORS_TO_SFRAME_H_ #define TURI_FACTORIZATION_FACTORS_TO_SFRAME_H_ -#include +#include +#include #include #include #include diff --git a/src/toolkits/factorization/factory_instantiations/basic_sgd_logistic.cpp b/src/ml/factorization/factory_instantiations/basic_sgd_logistic.cpp similarity index 83% rename from src/toolkits/factorization/factory_instantiations/basic_sgd_logistic.cpp rename to src/ml/factorization/factory_instantiations/basic_sgd_logistic.cpp index e8f8f2e0bc..0ce0eb6426 100644 --- a/src/toolkits/factorization/factory_instantiations/basic_sgd_logistic.cpp +++ b/src/ml/factorization/factory_instantiations/basic_sgd_logistic.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include // This macro instantiates all permutations of the loss and solver class. diff --git a/src/toolkits/factorization/factory_instantiations/basic_sgd_squared_error.cpp b/src/ml/factorization/factory_instantiations/basic_sgd_squared_error.cpp similarity index 83% rename from src/toolkits/factorization/factory_instantiations/basic_sgd_squared_error.cpp rename to src/ml/factorization/factory_instantiations/basic_sgd_squared_error.cpp index 1c969b629e..9243de8c84 100644 --- a/src/toolkits/factorization/factory_instantiations/basic_sgd_squared_error.cpp +++ b/src/ml/factorization/factory_instantiations/basic_sgd_squared_error.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include // This macro instantiates all permutations of the loss and solver class. diff --git a/src/toolkits/factorization/factory_instantiations/ranking_logistic.cpp b/src/ml/factorization/factory_instantiations/ranking_logistic.cpp similarity index 84% rename from src/toolkits/factorization/factory_instantiations/ranking_logistic.cpp rename to src/ml/factorization/factory_instantiations/ranking_logistic.cpp index a320afe48a..e537aa7a55 100644 --- a/src/toolkits/factorization/factory_instantiations/ranking_logistic.cpp +++ b/src/ml/factorization/factory_instantiations/ranking_logistic.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include // This macro instantiates all permutations of the loss and solver class. diff --git a/src/toolkits/factorization/factory_instantiations/ranking_squared_error.cpp b/src/ml/factorization/factory_instantiations/ranking_squared_error.cpp similarity index 84% rename from src/toolkits/factorization/factory_instantiations/ranking_squared_error.cpp rename to src/ml/factorization/factory_instantiations/ranking_squared_error.cpp index 20d8f080f2..e273185ff5 100644 --- a/src/toolkits/factorization/factory_instantiations/ranking_squared_error.cpp +++ b/src/ml/factorization/factory_instantiations/ranking_squared_error.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include // This macro instantiates all permutations of the loss and solver class. diff --git a/src/toolkits/factorization/loss_model_profiles.cpp b/src/ml/factorization/loss_model_profiles.cpp similarity index 93% rename from src/toolkits/factorization/loss_model_profiles.cpp rename to src/ml/factorization/loss_model_profiles.cpp index a215131950..f18cdc2762 100644 --- a/src/toolkits/factorization/loss_model_profiles.cpp +++ b/src/ml/factorization/loss_model_profiles.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/loss_model_profiles.hpp b/src/ml/factorization/loss_model_profiles.hpp similarity index 99% rename from src/toolkits/factorization/loss_model_profiles.hpp rename to src/ml/factorization/loss_model_profiles.hpp index f26a61ae33..f45f6c62fb 100644 --- a/src/toolkits/factorization/loss_model_profiles.hpp +++ b/src/ml/factorization/loss_model_profiles.hpp @@ -6,6 +6,7 @@ #ifndef TURI_FACTORIZATION_LOSS_MODEL_PROFILES_H_ #define TURI_FACTORIZATION_LOSS_MODEL_PROFILES_H_ +#include #include #include #include diff --git a/src/toolkits/factorization/model_factory.cpp b/src/ml/factorization/model_factory.cpp similarity index 84% rename from src/toolkits/factorization/model_factory.cpp rename to src/ml/factorization/model_factory.cpp index c4f93f4305..c367a7b4c3 100644 --- a/src/toolkits/factorization/model_factory.cpp +++ b/src/ml/factorization/model_factory.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/factorization/model_factory.hpp b/src/ml/factorization/model_factory.hpp similarity index 97% rename from src/toolkits/factorization/model_factory.hpp rename to src/ml/factorization/model_factory.hpp index 3bde9e4fad..822a4b7c4a 100644 --- a/src/toolkits/factorization/model_factory.hpp +++ b/src/ml/factorization/model_factory.hpp @@ -6,12 +6,13 @@ #ifndef TURI_FACTORIZATION_MODEL_CREATION_FACTORY_H_ #define TURI_FACTORIZATION_MODEL_CREATION_FACTORY_H_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/factorization/ranking_sgd_solver_base.hpp b/src/ml/factorization/ranking_sgd_solver_base.hpp similarity index 99% rename from src/toolkits/factorization/ranking_sgd_solver_base.hpp rename to src/ml/factorization/ranking_sgd_solver_base.hpp index 96b607dbee..8766a91c13 100644 --- a/src/toolkits/factorization/ranking_sgd_solver_base.hpp +++ b/src/ml/factorization/ranking_sgd_solver_base.hpp @@ -9,11 +9,12 @@ #include #include #include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/ranking_sgd_solver_explicit.hpp b/src/ml/factorization/ranking_sgd_solver_explicit.hpp similarity index 99% rename from src/toolkits/factorization/ranking_sgd_solver_explicit.hpp rename to src/ml/factorization/ranking_sgd_solver_explicit.hpp index e4b26d6bc6..bcdcb530ee 100644 --- a/src/toolkits/factorization/ranking_sgd_solver_explicit.hpp +++ b/src/ml/factorization/ranking_sgd_solver_explicit.hpp @@ -10,9 +10,10 @@ #include #include #include +#include #include -#include -#include +#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/ranking_sgd_solver_implicit.hpp b/src/ml/factorization/ranking_sgd_solver_implicit.hpp similarity index 98% rename from src/toolkits/factorization/ranking_sgd_solver_implicit.hpp rename to src/ml/factorization/ranking_sgd_solver_implicit.hpp index 9e42a76794..ecd0419015 100644 --- a/src/toolkits/factorization/ranking_sgd_solver_implicit.hpp +++ b/src/ml/factorization/ranking_sgd_solver_implicit.hpp @@ -9,9 +9,10 @@ #include #include #include +#include #include -#include -#include +#include +#include namespace turi { namespace factorization { diff --git a/src/toolkits/factorization/sgd_ranking_interface.hpp b/src/ml/factorization/sgd_ranking_interface.hpp similarity index 94% rename from src/toolkits/factorization/sgd_ranking_interface.hpp rename to src/ml/factorization/sgd_ranking_interface.hpp index 279d23103f..e353c977aa 100644 --- a/src/toolkits/factorization/sgd_ranking_interface.hpp +++ b/src/ml/factorization/sgd_ranking_interface.hpp @@ -6,7 +6,8 @@ #ifndef TURI_SGD_SGD_INTERFACE_BASE_H_ #define TURI_SGD_SGD_INTERFACE_BASE_H_ -#include +#include +#include namespace turi { namespace sgd { diff --git a/src/ml/ml_data/CMakeLists.txt b/src/ml/ml_data/CMakeLists.txt deleted file mode 100644 index 042a892fa9..0000000000 --- a/src/ml/ml_data/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -project(Turi) - -make_library(ml_data OBJECT - SOURCES - ml_data.cpp - metadata.cpp - ml_data_column_modes.cpp - data_storage/ml_data_block_manager.cpp - data_storage/ml_data_row_format.cpp - data_storage/ml_data_row_translation.cpp - data_storage/internal_metadata.cpp - data_storage/util.cpp - column_indexer.cpp - column_statistics.cpp - ml_data_iterator.cpp - row_reference.cpp - testing_utils.cpp - REQUIRES - unity_core eigen - EXTERNAL_VISIBILITY -) diff --git a/src/ml/ml_data/column_indexer.cpp b/src/ml/ml_data/column_indexer.cpp index 8b49ffc429..bcbbac09cf 100644 --- a/src/ml/ml_data/column_indexer.cpp +++ b/src/ml/ml_data/column_indexer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/column_indexer.hpp b/src/ml/ml_data/column_indexer.hpp index 6315526f6c..8966d2dd29 100644 --- a/src/ml/ml_data/column_indexer.hpp +++ b/src/ml/ml_data/column_indexer.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_COLUMN_INDEXER_H_ #define TURI_DML_DATA_COLUMN_INDEXER_H_ +#include #include #include #include diff --git a/src/ml/ml_data/column_statistics.cpp b/src/ml/ml_data/column_statistics.cpp index ca46ed51e2..ba0613981e 100644 --- a/src/ml/ml_data/column_statistics.cpp +++ b/src/ml/ml_data/column_statistics.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/column_statistics.hpp b/src/ml/ml_data/column_statistics.hpp index ae15a33d80..de50ec638e 100644 --- a/src/ml/ml_data/column_statistics.hpp +++ b/src/ml/ml_data/column_statistics.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_COLUMN_STATISTICS_H_ #define TURI_DML_DATA_COLUMN_STATISTICS_H_ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/internal_metadata.cpp b/src/ml/ml_data/data_storage/internal_metadata.cpp index ecb53628d8..d3e6d4a0b3 100644 --- a/src/ml/ml_data/data_storage/internal_metadata.cpp +++ b/src/ml/ml_data/data_storage/internal_metadata.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/internal_metadata.hpp b/src/ml/ml_data/data_storage/internal_metadata.hpp index 470b05097c..4ada07aa23 100644 --- a/src/ml/ml_data/data_storage/internal_metadata.hpp +++ b/src/ml/ml_data/data_storage/internal_metadata.hpp @@ -7,6 +7,7 @@ #ifndef TURI_DML_DATA_COLUMN_METADATA_H_ #define TURI_DML_DATA_COLUMN_METADATA_H_ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/ml_data_block_manager.cpp b/src/ml/ml_data/data_storage/ml_data_block_manager.cpp index a20ab0b5ba..ad83cdb38b 100644 --- a/src/ml/ml_data/data_storage/ml_data_block_manager.cpp +++ b/src/ml/ml_data/data_storage/ml_data_block_manager.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/ml_data/data_storage/ml_data_block_manager.hpp b/src/ml/ml_data/data_storage/ml_data_block_manager.hpp index b6857d2234..c5d9403696 100644 --- a/src/ml/ml_data/data_storage/ml_data_block_manager.hpp +++ b/src/ml/ml_data/data_storage/ml_data_block_manager.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_BLOCK_MANAGER_H_ #define TURI_DML_DATA_BLOCK_MANAGER_H_ +#include #include namespace turi { diff --git a/src/ml/ml_data/data_storage/ml_data_row_format.cpp b/src/ml/ml_data/data_storage/ml_data_row_format.cpp index 005d506854..21a07798be 100644 --- a/src/ml/ml_data/data_storage/ml_data_row_format.cpp +++ b/src/ml/ml_data/data_storage/ml_data_row_format.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/ml_data_row_format.hpp b/src/ml/ml_data/data_storage/ml_data_row_format.hpp index 1ed771c6d8..72d16b81e1 100644 --- a/src/ml/ml_data/data_storage/ml_data_row_format.hpp +++ b/src/ml/ml_data/data_storage/ml_data_row_format.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_ROW_FORMAT_H_ #define TURI_DML_DATA_ROW_FORMAT_H_ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/ml_data_row_translation.cpp b/src/ml/ml_data/data_storage/ml_data_row_translation.cpp index 318cdd2bb5..fd4fc9f2b8 100644 --- a/src/ml/ml_data/data_storage/ml_data_row_translation.cpp +++ b/src/ml/ml_data/data_storage/ml_data_row_translation.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/ml_data_row_translation.hpp b/src/ml/ml_data/data_storage/ml_data_row_translation.hpp index 971a8f484b..5d382af073 100644 --- a/src/ml/ml_data/data_storage/ml_data_row_translation.hpp +++ b/src/ml/ml_data/data_storage/ml_data_row_translation.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_ROW_TRANSATION_H_ #define TURI_DML_DATA_ROW_TRANSATION_H_ +#include #include #include #include diff --git a/src/ml/ml_data/data_storage/util.cpp b/src/ml/ml_data/data_storage/util.cpp index cb0d93151a..aac175bf8f 100644 --- a/src/ml/ml_data/data_storage/util.cpp +++ b/src/ml/ml_data/data_storage/util.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/ml_data/data_storage/util.hpp b/src/ml/ml_data/data_storage/util.hpp index 19efbaf884..a2dd3b3154 100644 --- a/src/ml/ml_data/data_storage/util.hpp +++ b/src/ml/ml_data/data_storage/util.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DATA_STORAGE_UTIL_H_ #define TURI_DATA_STORAGE_UTIL_H_ +#include #include #include diff --git a/src/ml/ml_data/metadata.cpp b/src/ml/ml_data/metadata.cpp index 54edf72dfc..fae6700d46 100644 --- a/src/ml/ml_data/metadata.cpp +++ b/src/ml/ml_data/metadata.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/metadata.hpp b/src/ml/ml_data/metadata.hpp index c6a8272f66..a3562031d8 100644 --- a/src/ml/ml_data/metadata.hpp +++ b/src/ml/ml_data/metadata.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_METADATA_H_ #define TURI_DML_METADATA_H_ +#include #include #include diff --git a/src/ml/ml_data/metadata_impl.hpp b/src/ml/ml_data/metadata_impl.hpp index 24c8ee1e1d..3560424821 100644 --- a/src/ml/ml_data/metadata_impl.hpp +++ b/src/ml/ml_data/metadata_impl.hpp @@ -368,3 +368,4 @@ inline bool ml_metadata::target_is_indexed() const { } #endif +#include diff --git a/src/ml/ml_data/ml_data.cpp b/src/ml/ml_data/ml_data.cpp index c04f8b25b6..ad16410774 100644 --- a/src/ml/ml_data/ml_data.cpp +++ b/src/ml/ml_data/ml_data.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/ml_data.hpp b/src/ml/ml_data/ml_data.hpp index f310bfc4b2..c2483c65ad 100644 --- a/src/ml/ml_data/ml_data.hpp +++ b/src/ml/ml_data/ml_data.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/ml/ml_data/ml_data_column_modes.cpp b/src/ml/ml_data/ml_data_column_modes.cpp index c428ce9ea6..77eec468ab 100644 --- a/src/ml/ml_data/ml_data_column_modes.cpp +++ b/src/ml/ml_data/ml_data_column_modes.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/ml_data_column_modes.hpp b/src/ml/ml_data/ml_data_column_modes.hpp index cbc1894c13..e208991c1d 100644 --- a/src/ml/ml_data/ml_data_column_modes.hpp +++ b/src/ml/ml_data/ml_data_column_modes.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #ifdef ERROR diff --git a/src/ml/ml_data/ml_data_entry.hpp b/src/ml/ml_data/ml_data_entry.hpp index 4e581006e7..fe03ec4a23 100644 --- a/src/ml/ml_data/ml_data_entry.hpp +++ b/src/ml/ml_data/ml_data_entry.hpp @@ -7,6 +7,7 @@ #define TURI_DML_DATA_ENTRY_H_ #include +#include #include namespace turi { diff --git a/src/ml/ml_data/ml_data_iterator.cpp b/src/ml/ml_data/ml_data_iterator.cpp index be3d3ba0b4..fafa029bd1 100644 --- a/src/ml/ml_data/ml_data_iterator.cpp +++ b/src/ml/ml_data/ml_data_iterator.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include using namespace turi::ml_data_internal; diff --git a/src/ml/ml_data/ml_data_iterator.hpp b/src/ml/ml_data/ml_data_iterator.hpp index fdbc2668f3..2f5ecd1f40 100644 --- a/src/ml/ml_data/ml_data_iterator.hpp +++ b/src/ml/ml_data/ml_data_iterator.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_ITERATOR_H_ #define TURI_DML_DATA_ITERATOR_H_ +#include #include #include #include diff --git a/src/ml/ml_data/row_reference.cpp b/src/ml/ml_data/row_reference.cpp index 64fd5369a9..a3f483d3af 100644 --- a/src/ml/ml_data/row_reference.cpp +++ b/src/ml/ml_data/row_reference.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/ml_data/row_reference.hpp b/src/ml/ml_data/row_reference.hpp index 094dc7c47b..59e3ae67eb 100644 --- a/src/ml/ml_data/row_reference.hpp +++ b/src/ml/ml_data/row_reference.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_ROW_REFERENCE_H_ #define TURI_DML_DATA_ROW_REFERENCE_H_ +#include #include #include #include diff --git a/src/ml/ml_data/testing_utils.cpp b/src/ml/ml_data/testing_utils.cpp index b13371eb22..778b19e418 100644 --- a/src/ml/ml_data/testing_utils.cpp +++ b/src/ml/ml_data/testing_utils.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/ml_data/testing_utils.hpp b/src/ml/ml_data/testing_utils.hpp index 278d41b73b..0ca685f155 100644 --- a/src/ml/ml_data/testing_utils.hpp +++ b/src/ml/ml_data/testing_utils.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DML_DATA_TESTING_UTILS_H_ #define TURI_DML_DATA_TESTING_UTILS_H_ +#include #include #include #include diff --git a/src/toolkits/ml_model/python_model.cpp b/src/ml/ml_model/python_model.cpp similarity index 99% rename from src/toolkits/ml_model/python_model.cpp rename to src/ml/ml_model/python_model.cpp index edaeb0de07..93f3bf3081 100644 --- a/src/toolkits/ml_model/python_model.cpp +++ b/src/ml/ml_model/python_model.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/toolkits/ml_model/python_model.hpp b/src/ml/ml_model/python_model.hpp similarity index 96% rename from src/toolkits/ml_model/python_model.hpp rename to src/ml/ml_model/python_model.hpp index 985b70e3a9..1a5e169920 100644 --- a/src/toolkits/ml_model/python_model.hpp +++ b/src/ml/ml_model/python_model.hpp @@ -6,6 +6,7 @@ #ifndef TURI_PYTHON_MODEL_ADDONE #define TURI_PYTHON_MODEL_ADDONE #include +#include #include #include diff --git a/src/ml/neural_net/TCMPSImageAugmenting.h b/src/ml/neural_net/TCMPSImageAugmenting.h index 260ab99bf0..2e1d25a26f 100644 --- a/src/ml/neural_net/TCMPSImageAugmenting.h +++ b/src/ml/neural_net/TCMPSImageAugmenting.h @@ -148,3 +148,4 @@ API_AVAILABLE(macos(10.13)) @end NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/compute_context.cpp b/src/ml/neural_net/compute_context.cpp index c2108479f4..f753b9e8bc 100644 --- a/src/ml/neural_net/compute_context.cpp +++ b/src/ml/neural_net/compute_context.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/neural_net/compute_context.hpp b/src/ml/neural_net/compute_context.hpp index 7539cfe24e..5e4aa4be93 100644 --- a/src/ml/neural_net/compute_context.hpp +++ b/src/ml/neural_net/compute_context.hpp @@ -9,6 +9,7 @@ #include +#include #include #include #include diff --git a/src/ml/neural_net/float_array.cpp b/src/ml/neural_net/float_array.cpp index 39c4ea0394..6f4b86de5e 100644 --- a/src/ml/neural_net/float_array.cpp +++ b/src/ml/neural_net/float_array.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/neural_net/float_array.hpp b/src/ml/neural_net/float_array.hpp index 0e63c63120..753821f015 100644 --- a/src/ml/neural_net/float_array.hpp +++ b/src/ml/neural_net/float_array.hpp @@ -14,6 +14,9 @@ #include #include +#include +#include + namespace turi { namespace neural_net { diff --git a/src/ml/neural_net/image_augmentation.cpp b/src/ml/neural_net/image_augmentation.cpp index b82ebb90de..2dbbdfd4d9 100644 --- a/src/ml/neural_net/image_augmentation.cpp +++ b/src/ml/neural_net/image_augmentation.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/neural_net/image_augmentation.hpp b/src/ml/neural_net/image_augmentation.hpp index bc14d2ee0b..1f1c438ce6 100644 --- a/src/ml/neural_net/image_augmentation.hpp +++ b/src/ml/neural_net/image_augmentation.hpp @@ -11,6 +11,8 @@ #include #include +#include +#include #include #include diff --git a/src/ml/neural_net/model_backend.hpp b/src/ml/neural_net/model_backend.hpp index 496dc5b2f7..7e10abe564 100644 --- a/src/ml/neural_net/model_backend.hpp +++ b/src/ml/neural_net/model_backend.hpp @@ -11,6 +11,7 @@ #include #include +#include #include namespace turi { diff --git a/src/ml/neural_net/model_spec.cpp b/src/ml/neural_net/model_spec.cpp index 89e8d1db3d..5682066b49 100644 --- a/src/ml/neural_net/model_spec.cpp +++ b/src/ml/neural_net/model_spec.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -14,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/src/ml/neural_net/model_spec.hpp b/src/ml/neural_net/model_spec.hpp index fc58daf190..b5d5739c42 100644 --- a/src/ml/neural_net/model_spec.hpp +++ b/src/ml/neural_net/model_spec.hpp @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/ml/neural_net/mps_cnnmodule.h b/src/ml/neural_net/mps_cnnmodule.h index 7b039c8fc2..9c59ac089b 100644 --- a/src/ml/neural_net/mps_cnnmodule.h +++ b/src/ml/neural_net/mps_cnnmodule.h @@ -10,6 +10,7 @@ #import #import +#include #include #include #include diff --git a/src/ml/neural_net/mps_command_queue.hpp b/src/ml/neural_net/mps_command_queue.hpp index 302e62d155..84446c83bc 100644 --- a/src/ml/neural_net/mps_command_queue.hpp +++ b/src/ml/neural_net/mps_command_queue.hpp @@ -47,3 +47,4 @@ NS_ASSUME_NONNULL_END #endif // __OBJC__ #endif // UNITY_TOOLKITS_NEURAL_NET_MPS_COMMAND_QUEUE_HPP_ +#include diff --git a/src/ml/neural_net/mps_compute_context.hpp b/src/ml/neural_net/mps_compute_context.hpp index 6215eb0dd4..7991872aef 100644 --- a/src/ml/neural_net/mps_compute_context.hpp +++ b/src/ml/neural_net/mps_compute_context.hpp @@ -9,6 +9,7 @@ #include +#include #include #include diff --git a/src/ml/neural_net/mps_descriptor_utils.h b/src/ml/neural_net/mps_descriptor_utils.h index 5f6bb42186..41ed9bf31a 100644 --- a/src/ml/neural_net/mps_descriptor_utils.h +++ b/src/ml/neural_net/mps_descriptor_utils.h @@ -91,4 +91,4 @@ @property (nonatomic) TCMPSConvolutionDescriptor* conv; @property (nonatomic) TCMPSInstanceNormalizationDescriptor* inst; -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/mps_descriptor_utils.m b/src/ml/neural_net/mps_descriptor_utils.m index a0b055787f..4ef365f4b6 100644 --- a/src/ml/neural_net/mps_descriptor_utils.m +++ b/src/ml/neural_net/mps_descriptor_utils.m @@ -128,4 +128,4 @@ - (instancetype) init { } return self; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/mps_device_manager.h b/src/ml/neural_net/mps_device_manager.h index ca5c99cea4..79482fb012 100644 --- a/src/ml/neural_net/mps_device_manager.h +++ b/src/ml/neural_net/mps_device_manager.h @@ -25,3 +25,4 @@ API_AVAILABLE(macos(10.13)) @end NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/mps_graph_cnnmodule.h b/src/ml/neural_net/mps_graph_cnnmodule.h index fb63a85dd7..b9e985f050 100644 --- a/src/ml/neural_net/mps_graph_cnnmodule.h +++ b/src/ml/neural_net/mps_graph_cnnmodule.h @@ -11,6 +11,7 @@ #import #import +#include #include #include #include diff --git a/src/ml/neural_net/mps_graph_layers.h b/src/ml/neural_net/mps_graph_layers.h index 67615596fa..9927d0eeb3 100644 --- a/src/ml/neural_net/mps_graph_layers.h +++ b/src/ml/neural_net/mps_graph_layers.h @@ -7,6 +7,7 @@ #import #import +#include #include #import "mps_layers.h" diff --git a/src/ml/neural_net/mps_graph_networks.h b/src/ml/neural_net/mps_graph_networks.h index 8758b105a4..81ae00c6bb 100644 --- a/src/ml/neural_net/mps_graph_networks.h +++ b/src/ml/neural_net/mps_graph_networks.h @@ -183,3 +183,4 @@ struct ODNetworkGraph : public MPSGraphNetwork { } // namespace turi #endif +#include diff --git a/src/ml/neural_net/mps_graph_trainer.h b/src/ml/neural_net/mps_graph_trainer.h index b4940a861b..c07e066e3c 100644 --- a/src/ml/neural_net/mps_graph_trainer.h +++ b/src/ml/neural_net/mps_graph_trainer.h @@ -44,3 +44,4 @@ EXPORT int TCMPSExportGraph(MPSHandle handle, #endif // __cplusplus #endif +#include diff --git a/src/ml/neural_net/mps_graph_trainer.mm b/src/ml/neural_net/mps_graph_trainer.mm index 2dc7ba3ce7..4f14c4e4c0 100644 --- a/src/ml/neural_net/mps_graph_trainer.mm +++ b/src/ml/neural_net/mps_graph_trainer.mm @@ -9,7 +9,7 @@ #import "mps_graph_cnnmodule.h" #include "mps_graph_networks.h" -#include "style_transfer/mps_style_transfer_backend.hpp" +#include using turi::neural_net::deferred_float_array; using turi::neural_net::external_float_array; diff --git a/src/ml/neural_net/mps_image_augmentation.hpp b/src/ml/neural_net/mps_image_augmentation.hpp index 470beb84df..48a483c601 100644 --- a/src/ml/neural_net/mps_image_augmentation.hpp +++ b/src/ml/neural_net/mps_image_augmentation.hpp @@ -7,6 +7,7 @@ #ifndef TURI_NEURAL_NET_CORE_IMAGE_AUGMENTATION_HPP_ #define TURI_NEURAL_NET_CORE_IMAGE_AUGMENTATION_HPP_ +#include #include #import diff --git a/src/ml/neural_net/mps_layer_conv_padding.h b/src/ml/neural_net/mps_layer_conv_padding.h index f3b34d4f83..efef56df6b 100644 --- a/src/ml/neural_net/mps_layer_conv_padding.h +++ b/src/ml/neural_net/mps_layer_conv_padding.h @@ -38,3 +38,4 @@ NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END @end +#include diff --git a/src/ml/neural_net/mps_layer_helper.h b/src/ml/neural_net/mps_layer_helper.h index d8cf1f9de4..d71007fd42 100644 --- a/src/ml/neural_net/mps_layer_helper.h +++ b/src/ml/neural_net/mps_layer_helper.h @@ -64,3 +64,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/mps_layer_instance_norm_data_loader.h b/src/ml/neural_net/mps_layer_instance_norm_data_loader.h index 989d2227d5..494e4de039 100644 --- a/src/ml/neural_net/mps_layer_instance_norm_data_loader.h +++ b/src/ml/neural_net/mps_layer_instance_norm_data_loader.h @@ -81,3 +81,4 @@ API_AVAILABLE(macos(10.14)) @end NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/mps_layers.h b/src/ml/neural_net/mps_layers.h index 2f2f8d9e38..b2b25ed1e9 100644 --- a/src/ml/neural_net/mps_layers.h +++ b/src/ml/neural_net/mps_layers.h @@ -552,4 +552,9 @@ struct LstmLayer : public Layer { } // namespace neural_net } // namespace turi +<<<<<<< HEAD +#endif +#include +======= NS_ASSUME_NONNULL_END +>>>>>>> master diff --git a/src/ml/neural_net/mps_lstm_helper.h b/src/ml/neural_net/mps_lstm_helper.h index f74403c8f9..6d1defcbff 100644 --- a/src/ml/neural_net/mps_lstm_helper.h +++ b/src/ml/neural_net/mps_lstm_helper.h @@ -28,3 +28,4 @@ void printMatrix(MPSMatrix * matrix, const char* name, NSUInteger byteOffset); } // namespace turi #endif /* mps_lstm_helper_h */ +#include diff --git a/src/ml/neural_net/mps_networks.h b/src/ml/neural_net/mps_networks.h index 6354224775..4a6e26e702 100644 --- a/src/ml/neural_net/mps_networks.h +++ b/src/ml/neural_net/mps_networks.h @@ -320,3 +320,9 @@ struct SingleLstmNetwork : public MPSNetwork { } // namespace neural_net } // namespace turi +<<<<<<< HEAD + +#endif +#include +======= +>>>>>>> master diff --git a/src/ml/neural_net/mps_node_handle.h b/src/ml/neural_net/mps_node_handle.h index 1471f220a0..d066607361 100644 --- a/src/ml/neural_net/mps_node_handle.h +++ b/src/ml/neural_net/mps_node_handle.h @@ -15,4 +15,4 @@ NS_ASSUME_NONNULL_BEGIN + (BOOL)supportsSecureCoding; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/src/ml/neural_net/mps_node_handle.m b/src/ml/neural_net/mps_node_handle.m index 38cf68ed82..97cf0bb738 100644 --- a/src/ml/neural_net/mps_node_handle.m +++ b/src/ml/neural_net/mps_node_handle.m @@ -42,4 +42,4 @@ + (BOOL)supportsSecureCoding { return YES; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/mps_trainer.h b/src/ml/neural_net/mps_trainer.h index b71adf77ef..060b390cf8 100644 --- a/src/ml/neural_net/mps_trainer.h +++ b/src/ml/neural_net/mps_trainer.h @@ -72,3 +72,4 @@ EXPORT int TCMPSTrain(MPSHandle handle, TCMPSFloatArrayRef inputs, #endif // __cplusplus #endif +#include diff --git a/src/ml/neural_net/mps_updater.h b/src/ml/neural_net/mps_updater.h index e89e5c41c2..b20e6ce19f 100644 --- a/src/ml/neural_net/mps_updater.h +++ b/src/ml/neural_net/mps_updater.h @@ -65,3 +65,4 @@ MPSUpdater *createUpdater(int updater_id); } // namespace turi #endif +#include diff --git a/src/ml/neural_net/mps_utils.h b/src/ml/neural_net/mps_utils.h index b06489c1f9..9b0b2043b1 100644 --- a/src/ml/neural_net/mps_utils.h +++ b/src/ml/neural_net/mps_utils.h @@ -12,6 +12,7 @@ #include #include +#include #include NS_ASSUME_NONNULL_BEGIN diff --git a/src/ml/neural_net/mps_weight.h b/src/ml/neural_net/mps_weight.h index ed1f6be4dd..d6ba6479cf 100644 --- a/src/ml/neural_net/mps_weight.h +++ b/src/ml/neural_net/mps_weight.h @@ -193,4 +193,6 @@ API_AVAILABLE(macos(10.14)) @end // TCMPSBatchNormWeights + +#endif /* MPS_WEIGHT_H_ */ NS_ASSUME_NONNULL_END diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer.h b/src/ml/neural_net/style_transfer/mps_style_transfer.h index 7bc17e276c..a251a62e97 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer.h @@ -42,4 +42,5 @@ API_AVAILABLE(macos(10.15)) #endif // #ifdef HAS_MACOS_10_15 -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer.m b/src/ml/neural_net/style_transfer/mps_style_transfer.m index 52434be299..9452970862 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer.m +++ b/src/ml/neural_net/style_transfer/mps_style_transfer.m @@ -518,4 +518,4 @@ - (void) checkpoint { @end -#endif // #ifdef HAS_MACOS_10_15 \ No newline at end of file +#endif // #ifdef HAS_MACOS_10_15 diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_backend.hpp b/src/ml/neural_net/style_transfer/mps_style_transfer_backend.hpp index 08ebd3dd3c..f6f0a0e9e8 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_backend.hpp +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_backend.hpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -48,4 +49,4 @@ class EXPORT mps_style_transfer : public turi::neural_net::model_backend { } // namespace style_transfer } // namespace turi -#endif // #ifdef HAS_MACOS_10_15 +#endif // #ifdef HAS_MACOS_10_15 \ No newline at end of file diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_backend.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_backend.mm index 4afddd9cd4..634ec7cbda 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_backend.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_backend.mm @@ -284,4 +284,4 @@ float_array_map convert_weights_mps_coreml(const float_array_map &mps_weights) { } // namespace style_transfer } // namespace turi -#endif // #ifdef HAS_MACOS_10_15 +#endif // #ifdef HAS_MACOS_10_15 \ No newline at end of file diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.h b/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.h index d408c0c27a..b1ae45e681 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.h @@ -32,4 +32,5 @@ API_AVAILABLE(macos(10.14)) - (NSDictionary *)exportWeights:(NSString *)prefix; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.mm index e25fe7260c..8ae5574cd4 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_decoding_node.mm @@ -132,4 +132,4 @@ - (void) setLearningRate:(float)lr { return weights; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.h b/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.h index ef4c2a4763..7453124139 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.h @@ -32,4 +32,5 @@ API_AVAILABLE(macos(10.14)) - (NSDictionary *) exportWeights:(NSString *)prefix; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.mm index 4da8c9579f..eae9405f7c 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_encoding_node.mm @@ -126,4 +126,4 @@ - (void) setLearningRate:(float)lr { return weights; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.h b/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.h index 892d83dbf8..2da731d65e 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.h @@ -27,4 +27,5 @@ API_AVAILABLE(macos(10.14)) @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.m b/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.m index 9f7bda6ed4..2cc19cf4b7 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.m +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_pre_processing.m @@ -38,4 +38,4 @@ - (MPSNNImageNode *) backwardPass:(MPSNNImageNode *)inputNode { return [multiplicationGrad resultImage]; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.h b/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.h index d0e1a4d098..02a5972d68 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.h @@ -32,4 +32,5 @@ API_AVAILABLE(macos(10.14)) - (NSDictionary *)exportWeights:(NSString *)prefix; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.mm index dc108ab29d..22dcd00f66 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_residual_node.mm @@ -207,4 +207,4 @@ - (void) setLearningRate:(float)lr { return weights; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.h b/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.h index 75ceef54a2..b34df64df8 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.h @@ -32,4 +32,5 @@ API_AVAILABLE(macos(10.14)) - (NSDictionary *) exportWeights:(NSString *) prefix; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.mm index 16c9d0c01f..af26ce37d0 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_transformer_network.mm @@ -285,4 +285,4 @@ - (void) setLearningRate:(float)lr { return weights; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_utils.h b/src/ml/neural_net/style_transfer/mps_style_transfer_utils.h index b01c5bbb43..10b31d62d6 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_utils.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_utils.h @@ -46,4 +46,5 @@ + (void) populateMultiplication:(NSMutableData *)data; @end -#endif // #ifdef HAS_MACOS_10_15 \ No newline at end of file +#endif // #ifdef HAS_MACOS_10_15 +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_utils.m b/src/ml/neural_net/style_transfer/mps_style_transfer_utils.m index 0cfee3a52b..e109fcc01c 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_utils.m +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_utils.m @@ -529,4 +529,4 @@ + (void)populateVarianceCWH:(NSMutableData *)data } @end -#endif // #ifdef HAS_MACOS_10_15 +#endif // #ifdef HAS_MACOS_10_15 \ No newline at end of file diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.h b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.h index fe438aeb6f..68bd86335b 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.h @@ -30,4 +30,5 @@ API_AVAILABLE(macos(10.14)) - (void) setLearningRate:(float)lr; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.mm index 4325e28c71..b705617544 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_1_node.mm @@ -90,4 +90,4 @@ - (void) setLearningRate:(float)lr { [_conv2.tc_weightsData setLearningRate:lr]; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.h b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.h index 941774f765..a12efd3f4e 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.h @@ -30,4 +30,5 @@ API_AVAILABLE(macos(10.14)) - (void) setLearningRate:(float)lr; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.mm b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.mm index 3870780ba3..6c63886130 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.mm +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_block_2_node.mm @@ -111,4 +111,4 @@ - (void) setLearningRate:(float)lr { [_conv3.tc_weightsData setLearningRate:lr]; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.h b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.h index 4e673f3c43..26f6add72c 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.h @@ -34,4 +34,5 @@ API_AVAILABLE(macos(10.14)) - (void) setLearningRate:(float)lr; @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END +#include diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.m b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.m index af81f20deb..1058913141 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.m +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_vgg_16_network.m @@ -80,4 +80,4 @@ - (void) setLearningRate:(float)lr { [_block4 setLearningRate:lr]; } -@end \ No newline at end of file +@end diff --git a/src/ml/neural_net/style_transfer/mps_style_transfer_weights.h b/src/ml/neural_net/style_transfer/mps_style_transfer_weights.h index b046174df0..cae4f1ad72 100644 --- a/src/ml/neural_net/style_transfer/mps_style_transfer_weights.h +++ b/src/ml/neural_net/style_transfer/mps_style_transfer_weights.h @@ -10,3 +10,4 @@ @property (nonatomic) NSData *data; @property (nonatomic) NSArray *shape; @end +#include diff --git a/src/ml/neural_net/weight_init.cpp b/src/ml/neural_net/weight_init.cpp index 351956b08c..54b56e778c 100644 --- a/src/ml/neural_net/weight_init.cpp +++ b/src/ml/neural_net/weight_init.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/ml/neural_net/weight_init.hpp b/src/ml/neural_net/weight_init.hpp index 85f1da4c66..ec9e2cee85 100644 --- a/src/ml/neural_net/weight_init.hpp +++ b/src/ml/neural_net/weight_init.hpp @@ -9,6 +9,7 @@ #include #include +#include namespace turi { namespace neural_net { diff --git a/src/ml/optimization/CMakeLists.txt b/src/ml/optimization/CMakeLists.txt deleted file mode 100644 index b18254059b..0000000000 --- a/src/ml/optimization/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -project(Turi) - -make_library(optimization OBJECT - SOURCES - utils.cpp - lbfgs.cpp - optimization_interface.cpp - REQUIRES - flexible_type - eigen - sframe -) diff --git a/src/ml/optimization/accelerated_gradient-inl.hpp b/src/ml/optimization/accelerated_gradient-inl.hpp index 7cce030375..7f24dd5569 100644 --- a/src/ml/optimization/accelerated_gradient-inl.hpp +++ b/src/ml/optimization/accelerated_gradient-inl.hpp @@ -7,6 +7,7 @@ #define TURI_ACCELERATED_GRADIENT_H_ // Types +#include #include #include diff --git a/src/ml/optimization/constraint_interface.hpp b/src/ml/optimization/constraint_interface.hpp index 303bc6a6bb..7bd89de799 100644 --- a/src/ml/optimization/constraint_interface.hpp +++ b/src/ml/optimization/constraint_interface.hpp @@ -7,6 +7,7 @@ #define TURI_CONSTRAINT_INTERFACE_H_ #include +#include #include // Eigen diff --git a/src/ml/optimization/constraints-inl.hpp b/src/ml/optimization/constraints-inl.hpp index cdb8dfcf90..9d53248ac2 100644 --- a/src/ml/optimization/constraints-inl.hpp +++ b/src/ml/optimization/constraints-inl.hpp @@ -7,6 +7,7 @@ #define TURI_CONSTRAINTS_H_ #include +#include #include // Eigen diff --git a/src/ml/optimization/gradient_descent-inl.hpp b/src/ml/optimization/gradient_descent-inl.hpp index 9bbbc0577c..b45a6aa235 100644 --- a/src/ml/optimization/gradient_descent-inl.hpp +++ b/src/ml/optimization/gradient_descent-inl.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GRADIENT_DESCENT_H_ #define TURI_GRADIENT_DESCENT_H_ +#include #include #include diff --git a/src/ml/optimization/lbfgs.cpp b/src/ml/optimization/lbfgs.cpp index 4dd2d394a1..67b629fed7 100644 --- a/src/ml/optimization/lbfgs.cpp +++ b/src/ml/optimization/lbfgs.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/ml/optimization/lbfgs.hpp b/src/ml/optimization/lbfgs.hpp index 1e5da8afc1..072e406fda 100644 --- a/src/ml/optimization/lbfgs.hpp +++ b/src/ml/optimization/lbfgs.hpp @@ -6,6 +6,7 @@ #ifndef TURI_LBFGS_2_H_ #define TURI_LBFGS_2_H_ +#include #include #include #include diff --git a/src/ml/optimization/line_search-inl.hpp b/src/ml/optimization/line_search-inl.hpp index d4d64cdb9b..e982eb49d5 100644 --- a/src/ml/optimization/line_search-inl.hpp +++ b/src/ml/optimization/line_search-inl.hpp @@ -7,6 +7,7 @@ #define TURI_LINE_SEARCH_H_ // Types +#include #include // Optimization diff --git a/src/ml/optimization/newton_method-inl.hpp b/src/ml/optimization/newton_method-inl.hpp index d1a5bbf8a5..5486419039 100644 --- a/src/ml/optimization/newton_method-inl.hpp +++ b/src/ml/optimization/newton_method-inl.hpp @@ -6,6 +6,7 @@ #ifndef TURI_NEWTON_METHOD_H_ #define TURI_NEWTON_METHOD_H_ +#include #include #include #include diff --git a/src/ml/optimization/optimization_interface.cpp b/src/ml/optimization/optimization_interface.cpp index 8288090b94..d212b5126f 100644 --- a/src/ml/optimization/optimization_interface.cpp +++ b/src/ml/optimization/optimization_interface.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/ml/optimization/optimization_interface.hpp b/src/ml/optimization/optimization_interface.hpp index 3461cb3e2b..ddff57fab3 100644 --- a/src/ml/optimization/optimization_interface.hpp +++ b/src/ml/optimization/optimization_interface.hpp @@ -7,6 +7,7 @@ #define TURI_OPTIMIZATION_INTERFACE_H_ #include +#include #include #include #include diff --git a/src/ml/optimization/regularizer_interface.hpp b/src/ml/optimization/regularizer_interface.hpp index cd247f3bd5..23aa0c4854 100644 --- a/src/ml/optimization/regularizer_interface.hpp +++ b/src/ml/optimization/regularizer_interface.hpp @@ -7,6 +7,7 @@ #define TURI_REGULARIZER_INTERFACE_H_ #include +#include #include // Eigen diff --git a/src/ml/optimization/regularizers-inl.hpp b/src/ml/optimization/regularizers-inl.hpp index 0b8a138893..9b739c8f5e 100644 --- a/src/ml/optimization/regularizers-inl.hpp +++ b/src/ml/optimization/regularizers-inl.hpp @@ -7,6 +7,7 @@ #define TURI_REGULARIZER_H_ #include +#include #include // Eigen diff --git a/src/ml/optimization/utils.cpp b/src/ml/optimization/utils.cpp index 3e5857842a..41154efea4 100644 --- a/src/ml/optimization/utils.cpp +++ b/src/ml/optimization/utils.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/ml/optimization/utils.hpp b/src/ml/optimization/utils.hpp index 65096ce03d..597356e547 100644 --- a/src/ml/optimization/utils.hpp +++ b/src/ml/optimization/utils.hpp @@ -8,6 +8,7 @@ +#include #include #include #include diff --git a/src/toolkits/sgd/basic_sgd_solver.hpp b/src/ml/sgd/basic_sgd_solver.hpp similarity index 96% rename from src/toolkits/sgd/basic_sgd_solver.hpp rename to src/ml/sgd/basic_sgd_solver.hpp index d39f1c995e..637699602c 100644 --- a/src/toolkits/sgd/basic_sgd_solver.hpp +++ b/src/ml/sgd/basic_sgd_solver.hpp @@ -7,10 +7,11 @@ #define TURI_SGD_BASIC_SGD_SOLVER_CLASS_H_ #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef interface #undef interface diff --git a/src/toolkits/sgd/sgd_interface.hpp b/src/ml/sgd/sgd_interface.hpp similarity index 99% rename from src/toolkits/sgd/sgd_interface.hpp rename to src/ml/sgd/sgd_interface.hpp index 75f620e480..158a9e53b6 100644 --- a/src/toolkits/sgd/sgd_interface.hpp +++ b/src/ml/sgd/sgd_interface.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace turi { diff --git a/src/toolkits/sgd/sgd_solver_base.cpp b/src/ml/sgd/sgd_solver_base.cpp similarity index 99% rename from src/toolkits/sgd/sgd_solver_base.cpp rename to src/ml/sgd/sgd_solver_base.cpp index 4546366c31..24f950f2e0 100644 --- a/src/toolkits/sgd/sgd_solver_base.cpp +++ b/src/ml/sgd/sgd_solver_base.cpp @@ -4,16 +4,17 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include #include #include -#include +#include #include #include -#include +#include namespace turi { namespace sgd { diff --git a/src/toolkits/sgd/sgd_solver_base.hpp b/src/ml/sgd/sgd_solver_base.hpp similarity index 99% rename from src/toolkits/sgd/sgd_solver_base.hpp rename to src/ml/sgd/sgd_solver_base.hpp index 696924cba0..b27863e2af 100644 --- a/src/toolkits/sgd/sgd_solver_base.hpp +++ b/src/ml/sgd/sgd_solver_base.hpp @@ -7,9 +7,10 @@ #define TURI_SGD_SGD_SOLVER_CLASS_H_ #include +#include #include #include -#include +#include #include #include #include diff --git a/src/ml/sketches/CMakeLists.txt b/src/ml/sketches/CMakeLists.txt deleted file mode 100644 index e6d4fc632b..0000000000 --- a/src/ml/sketches/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -project(Turi) - -make_library( - unity_sketches OBJECT - SOURCES - unity_sketch.cpp -) diff --git a/src/ml/sketches/countmin.hpp b/src/ml/sketches/countmin.hpp index c3f46f7e49..7a9a6719e3 100644 --- a/src/ml/sketches/countmin.hpp +++ b/src/ml/sketches/countmin.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SKETCHES_COUNTMIN_HPP #define TURI_SKETCHES_COUNTMIN_HPP +#include #include #include #include diff --git a/src/ml/sketches/countsketch.hpp b/src/ml/sketches/countsketch.hpp index 1c065cc3cf..adce4912f2 100644 --- a/src/ml/sketches/countsketch.hpp +++ b/src/ml/sketches/countsketch.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SKETCHES_COUNTSKETCH_HPP #define TURI_SKETCHES_COUNTSKETCH_HPP +#include #include #include #include diff --git a/src/ml/sketches/hyperloglog.hpp b/src/ml/sketches/hyperloglog.hpp index 6a09a05208..6aa8e5dbda 100644 --- a/src/ml/sketches/hyperloglog.hpp +++ b/src/ml/sketches/hyperloglog.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SKETCH_HYPERLOGLOG_HPP #define TURI_SKETCH_HYPERLOGLOG_HPP +#include #include #include #include diff --git a/src/ml/sketches/quantile_sketch.hpp b/src/ml/sketches/quantile_sketch.hpp index 763dca24b0..5eedaaf49b 100644 --- a/src/ml/sketches/quantile_sketch.hpp +++ b/src/ml/sketches/quantile_sketch.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_SKETCH_QUANTILE_SKETCH_HPP #define TURI_SKETCH_QUANTILE_SKETCH_HPP +#include #include #include #include diff --git a/src/ml/sketches/space_saving.hpp b/src/ml/sketches/space_saving.hpp index 591d242e7d..c9ecf11e4d 100644 --- a/src/ml/sketches/space_saving.hpp +++ b/src/ml/sketches/space_saving.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/ml/sketches/space_saving_flextype.hpp b/src/ml/sketches/space_saving_flextype.hpp index 3c4d4768e5..6eef944a65 100644 --- a/src/ml/sketches/space_saving_flextype.hpp +++ b/src/ml/sketches/space_saving_flextype.hpp @@ -7,6 +7,7 @@ #define TURI_SKETCHES_SPACE_SAVING_SKETCH_FLEXTYPE_HPP #include +#include #include #include diff --git a/src/ml/sketches/streaming_quantile_sketch.hpp b/src/ml/sketches/streaming_quantile_sketch.hpp index 0837a44a97..0824ae18b5 100644 --- a/src/ml/sketches/streaming_quantile_sketch.hpp +++ b/src/ml/sketches/streaming_quantile_sketch.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SKETCH_STREAMING_QUANTILE_SKETCH_HPP #define TURI_SKETCH_STREAMING_QUANTILE_SKETCH_HPP #include +#include #include #include #include diff --git a/src/ml/sketches/unity_sketch.cpp b/src/ml/sketches/unity_sketch.cpp index 45fbaaa699..5e4f8cf811 100644 --- a/src/ml/sketches/unity_sketch.cpp +++ b/src/ml/sketches/unity_sketch.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ml/sketches/unity_sketch.hpp b/src/ml/sketches/unity_sketch.hpp index 5ef35ac284..fcb1b24e89 100644 --- a/src/ml/sketches/unity_sketch.hpp +++ b/src/ml/sketches/unity_sketch.hpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/toolkits/sparse_similarity/index_mapper.hpp b/src/ml/sparse_similarity/index_mapper.hpp similarity index 99% rename from src/toolkits/sparse_similarity/index_mapper.hpp rename to src/ml/sparse_similarity/index_mapper.hpp index fb1da96ed0..5748ac862e 100644 --- a/src/toolkits/sparse_similarity/index_mapper.hpp +++ b/src/ml/sparse_similarity/index_mapper.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_VECTOR_INDEX_MAPPER_H_ #include +#include #include namespace turi { diff --git a/src/toolkits/sparse_similarity/item_processing.hpp b/src/ml/sparse_similarity/item_processing.hpp similarity index 98% rename from src/toolkits/sparse_similarity/item_processing.hpp rename to src/ml/sparse_similarity/item_processing.hpp index 9e11be0700..32def1c307 100644 --- a/src/toolkits/sparse_similarity/item_processing.hpp +++ b/src/ml/sparse_similarity/item_processing.hpp @@ -6,8 +6,9 @@ #ifndef TURI_UNITY_SPARSE_SIMILARITY_ITEM_STATISTICS_H #define TURI_UNITY_SPARSE_SIMILARITY_ITEM_STATISTICS_H -#include -#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/sparse_similarity/neighbor_search.hpp b/src/ml/sparse_similarity/neighbor_search.hpp similarity index 99% rename from src/toolkits/sparse_similarity/neighbor_search.hpp rename to src/ml/sparse_similarity/neighbor_search.hpp index a6cd1b1041..e9f46d6eff 100644 --- a/src/toolkits/sparse_similarity/neighbor_search.hpp +++ b/src/ml/sparse_similarity/neighbor_search.hpp @@ -6,13 +6,14 @@ #ifndef TURI_SPARSE_SIMILARITY_NEIGHBOR_SEARCH_H #define TURI_SPARSE_SIMILARITY_NEIGHBOR_SEARCH_H +#include #include #include #include #include #include -#include -#include +#include +#include namespace turi { namespace sparse_sim { diff --git a/src/toolkits/sparse_similarity/similarities.hpp b/src/ml/sparse_similarity/similarities.hpp similarity index 99% rename from src/toolkits/sparse_similarity/similarities.hpp rename to src/ml/sparse_similarity/similarities.hpp index 29ce9349be..e1945538f6 100644 --- a/src/toolkits/sparse_similarity/similarities.hpp +++ b/src/ml/sparse_similarity/similarities.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_ITEM_SIMILARITY_LOOKUP_AGGREGATORS_H_ #define TURI_UNITY_ITEM_SIMILARITY_LOOKUP_AGGREGATORS_H_ +#include #include namespace turi { namespace sparse_sim { diff --git a/src/toolkits/sparse_similarity/sliced_itemitem_matrix.cpp b/src/ml/sparse_similarity/sliced_itemitem_matrix.cpp similarity index 96% rename from src/toolkits/sparse_similarity/sliced_itemitem_matrix.cpp rename to src/ml/sparse_similarity/sliced_itemitem_matrix.cpp index 1f998ff30d..74d7fbe3e0 100644 --- a/src/toolkits/sparse_similarity/sliced_itemitem_matrix.cpp +++ b/src/ml/sparse_similarity/sliced_itemitem_matrix.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include diff --git a/src/toolkits/sparse_similarity/sliced_itemitem_matrix.hpp b/src/ml/sparse_similarity/sliced_itemitem_matrix.hpp similarity index 99% rename from src/toolkits/sparse_similarity/sliced_itemitem_matrix.hpp rename to src/ml/sparse_similarity/sliced_itemitem_matrix.hpp index d98b82262b..8580fad7e1 100644 --- a/src/toolkits/sparse_similarity/sliced_itemitem_matrix.hpp +++ b/src/ml/sparse_similarity/sliced_itemitem_matrix.hpp @@ -7,6 +7,7 @@ #define TURI_SPARSE_SIM_SLICED_MATRIX_UTILITIES_H #include +#include #include #include #include diff --git a/src/toolkits/sparse_similarity/sparse_similarity_lookup.cpp b/src/ml/sparse_similarity/sparse_similarity_lookup.cpp similarity index 95% rename from src/toolkits/sparse_similarity/sparse_similarity_lookup.cpp rename to src/ml/sparse_similarity/sparse_similarity_lookup.cpp index f622e42a8b..c5c207dddf 100644 --- a/src/toolkits/sparse_similarity/sparse_similarity_lookup.cpp +++ b/src/ml/sparse_similarity/sparse_similarity_lookup.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include +#include +#include +#include +#include namespace turi { diff --git a/src/toolkits/sparse_similarity/sparse_similarity_lookup.hpp b/src/ml/sparse_similarity/sparse_similarity_lookup.hpp similarity index 99% rename from src/toolkits/sparse_similarity/sparse_similarity_lookup.hpp rename to src/ml/sparse_similarity/sparse_similarity_lookup.hpp index 6b90039bfa..a5449850bc 100644 --- a/src/toolkits/sparse_similarity/sparse_similarity_lookup.hpp +++ b/src/ml/sparse_similarity/sparse_similarity_lookup.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_ITEM_SIMILARITY_LOOKUP_H_ #define TURI_UNITY_ITEM_SIMILARITY_LOOKUP_H_ +#include #include #include diff --git a/src/toolkits/sparse_similarity/sparse_similarity_lookup_impl.hpp b/src/ml/sparse_similarity/sparse_similarity_lookup_impl.hpp similarity index 99% rename from src/toolkits/sparse_similarity/sparse_similarity_lookup_impl.hpp rename to src/ml/sparse_similarity/sparse_similarity_lookup_impl.hpp index 901ceb0e7f..9f5f583fa4 100644 --- a/src/toolkits/sparse_similarity/sparse_similarity_lookup_impl.hpp +++ b/src/ml/sparse_similarity/sparse_similarity_lookup_impl.hpp @@ -6,13 +6,14 @@ #ifndef TURI_UNITY_ITEM_SIMILARITY_LOOKUP_CONSTRUCTION_H_ #define TURI_UNITY_ITEM_SIMILARITY_LOOKUP_CONSTRUCTION_H_ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/sparse_similarity/utilities.hpp b/src/ml/sparse_similarity/utilities.hpp similarity index 99% rename from src/toolkits/sparse_similarity/utilities.hpp rename to src/ml/sparse_similarity/utilities.hpp index f5663c999b..749ecf4f2d 100644 --- a/src/toolkits/sparse_similarity/utilities.hpp +++ b/src/ml/sparse_similarity/utilities.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SPARSE_SIMILARITY_UTILITIES_H #define TURI_SPARSE_SIMILARITY_UTILITIES_H +#include #include #include #include diff --git a/src/toolkits/supervised_learning/automatic_model_creation.cpp b/src/ml/supervised_learning/automatic_model_creation.cpp similarity index 95% rename from src/toolkits/supervised_learning/automatic_model_creation.cpp rename to src/ml/supervised_learning/automatic_model_creation.cpp index e16bbc4c3a..fb6e102800 100644 --- a/src/toolkits/supervised_learning/automatic_model_creation.cpp +++ b/src/ml/supervised_learning/automatic_model_creation.cpp @@ -1,4 +1,5 @@ -#include +#include +#include #include #include @@ -8,14 +9,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace turi { diff --git a/src/toolkits/supervised_learning/automatic_model_creation.hpp b/src/ml/supervised_learning/automatic_model_creation.hpp similarity index 93% rename from src/toolkits/supervised_learning/automatic_model_creation.hpp rename to src/ml/supervised_learning/automatic_model_creation.hpp index d1849c6279..a2efc503ec 100644 --- a/src/toolkits/supervised_learning/automatic_model_creation.hpp +++ b/src/ml/supervised_learning/automatic_model_creation.hpp @@ -1,7 +1,8 @@ #ifndef TURI_AUTOMATIC_SUPERVISED_LEARNING_H_ #define TURI_AUTOMATIC_SUPERVISED_LEARNING_H_ -#include +#include +#include namespace turi { namespace supervised { diff --git a/src/toolkits/supervised_learning/boosted_trees.cpp b/src/ml/supervised_learning/boosted_trees.cpp similarity index 98% rename from src/toolkits/supervised_learning/boosted_trees.cpp rename to src/ml/supervised_learning/boosted_trees.cpp index 52d584ed8a..3fc33f59b8 100644 --- a/src/toolkits/supervised_learning/boosted_trees.cpp +++ b/src/ml/supervised_learning/boosted_trees.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/supervised_learning/boosted_trees.hpp b/src/ml/supervised_learning/boosted_trees.hpp similarity index 96% rename from src/toolkits/supervised_learning/boosted_trees.hpp rename to src/ml/supervised_learning/boosted_trees.hpp index 76d3978b47..a11720aa28 100644 --- a/src/toolkits/supervised_learning/boosted_trees.hpp +++ b/src/ml/supervised_learning/boosted_trees.hpp @@ -6,8 +6,9 @@ #ifndef TURI_BOOSTED_TREES_H_ #define TURI_BOOSTED_TREES_H_ // unity xgboost -#include -#include +#include +#include +#include #include diff --git a/src/toolkits/supervised_learning/class_registrations.cpp b/src/ml/supervised_learning/class_registrations.cpp similarity index 70% rename from src/toolkits/supervised_learning/class_registrations.cpp rename to src/ml/supervised_learning/class_registrations.cpp index 21904ff239..6965348714 100644 --- a/src/toolkits/supervised_learning/class_registrations.cpp +++ b/src/ml/supervised_learning/class_registrations.cpp @@ -1,13 +1,14 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include namespace turi { namespace supervised { diff --git a/src/toolkits/supervised_learning/class_registrations.hpp b/src/ml/supervised_learning/class_registrations.hpp similarity index 94% rename from src/toolkits/supervised_learning/class_registrations.hpp rename to src/ml/supervised_learning/class_registrations.hpp index 27abe14a61..6f3fd7a7b8 100644 --- a/src/toolkits/supervised_learning/class_registrations.hpp +++ b/src/ml/supervised_learning/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_SUPERVISED_CLASS_REGISTRATIONS #define TURI_SUPERVISED_CLASS_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/supervised_learning/classifier_evaluations.cpp b/src/ml/supervised_learning/classifier_evaluations.cpp similarity index 97% rename from src/toolkits/supervised_learning/classifier_evaluations.cpp rename to src/ml/supervised_learning/classifier_evaluations.cpp index dcad76dad1..ba17441502 100644 --- a/src/toolkits/supervised_learning/classifier_evaluations.cpp +++ b/src/ml/supervised_learning/classifier_evaluations.cpp @@ -1,4 +1,5 @@ -#include +#include +#include namespace turi { namespace supervised { diff --git a/src/toolkits/supervised_learning/classifier_evaluations.hpp b/src/ml/supervised_learning/classifier_evaluations.hpp similarity index 75% rename from src/toolkits/supervised_learning/classifier_evaluations.hpp rename to src/ml/supervised_learning/classifier_evaluations.hpp index 300157db8a..108b253c7a 100644 --- a/src/toolkits/supervised_learning/classifier_evaluations.hpp +++ b/src/ml/supervised_learning/classifier_evaluations.hpp @@ -1,8 +1,9 @@ #ifndef TURI_SUPERVISED_LEARNING_CLASSIFIER_EVALUATION_H_ #define TURI_SUPERVISED_LEARNING_CLASSIFIER_EVALUATION_H_ -#include -#include +#include +#include +#include namespace turi { diff --git a/src/toolkits/supervised_learning/decision_tree.cpp b/src/ml/supervised_learning/decision_tree.cpp similarity index 97% rename from src/toolkits/supervised_learning/decision_tree.cpp rename to src/ml/supervised_learning/decision_tree.cpp index 4b9c88acb0..937f78f1d4 100644 --- a/src/toolkits/supervised_learning/decision_tree.cpp +++ b/src/ml/supervised_learning/decision_tree.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/supervised_learning/decision_tree.hpp b/src/ml/supervised_learning/decision_tree.hpp similarity index 95% rename from src/toolkits/supervised_learning/decision_tree.hpp rename to src/ml/supervised_learning/decision_tree.hpp index e2f59cbdea..e735ecdaeb 100644 --- a/src/toolkits/supervised_learning/decision_tree.hpp +++ b/src/ml/supervised_learning/decision_tree.hpp @@ -6,8 +6,9 @@ #ifndef TURI_DECISION_TREE_H_ #define TURI_DECISION_TREE_H_ // unity xgboost -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/supervised_learning/linear_regression.cpp b/src/ml/supervised_learning/linear_regression.cpp similarity index 98% rename from src/toolkits/supervised_learning/linear_regression.cpp rename to src/ml/supervised_learning/linear_regression.cpp index c88ca73310..115b253415 100644 --- a/src/toolkits/supervised_learning/linear_regression.cpp +++ b/src/ml/supervised_learning/linear_regression.cpp @@ -3,17 +3,18 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include // ML Data #include // Core ML -#include +#include // Toolkits -#include -#include +#include +#include // Solvers #include diff --git a/src/toolkits/supervised_learning/linear_regression.hpp b/src/ml/supervised_learning/linear_regression.hpp similarity index 96% rename from src/toolkits/supervised_learning/linear_regression.hpp rename to src/ml/supervised_learning/linear_regression.hpp index d81d28c620..234ef303cc 100644 --- a/src/toolkits/supervised_learning/linear_regression.hpp +++ b/src/ml/supervised_learning/linear_regression.hpp @@ -7,12 +7,13 @@ #define TURI_REGR_LINEAR_REGRESSION_H_ // ML-Data Utils +#include #include // Toolkits -#include -#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/linear_regression_opt_interface.cpp b/src/ml/supervised_learning/linear_regression_opt_interface.cpp similarity index 97% rename from src/toolkits/supervised_learning/linear_regression_opt_interface.cpp rename to src/ml/supervised_learning/linear_regression_opt_interface.cpp index 0880bfcb0b..1f80f0dd32 100644 --- a/src/toolkits/supervised_learning/linear_regression_opt_interface.cpp +++ b/src/ml/supervised_learning/linear_regression_opt_interface.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include // Toolkits -#include -#include -#include -#include +#include +#include +#include +#include // Solvers #include diff --git a/src/toolkits/supervised_learning/linear_regression_opt_interface.hpp b/src/ml/supervised_learning/linear_regression_opt_interface.hpp similarity index 96% rename from src/toolkits/supervised_learning/linear_regression_opt_interface.hpp rename to src/ml/supervised_learning/linear_regression_opt_interface.hpp index f497a170a2..77dbe4244c 100644 --- a/src/toolkits/supervised_learning/linear_regression_opt_interface.hpp +++ b/src/ml/supervised_learning/linear_regression_opt_interface.hpp @@ -7,13 +7,14 @@ #define TURI_REGR_LINEAR_REGRESSION_OPT_INTERFACE_H_ // ML-Data Utils +#include #include // Toolkits -#include -#include -#include +#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/linear_svm.cpp b/src/ml/supervised_learning/linear_svm.cpp similarity index 97% rename from src/toolkits/supervised_learning/linear_svm.cpp rename to src/ml/supervised_learning/linear_svm.cpp index c0a79cf7d8..2522b3c0a3 100644 --- a/src/toolkits/supervised_learning/linear_svm.cpp +++ b/src/ml/supervised_learning/linear_svm.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data +#include #include #include #include @@ -12,12 +13,12 @@ #include // Toolkits -#include -#include -#include +#include +#include +#include // CoreML -#include +#include // Solvers diff --git a/src/toolkits/supervised_learning/linear_svm.hpp b/src/ml/supervised_learning/linear_svm.hpp similarity index 97% rename from src/toolkits/supervised_learning/linear_svm.hpp rename to src/ml/supervised_learning/linear_svm.hpp index 92abf67b61..68b0ddeb2b 100644 --- a/src/toolkits/supervised_learning/linear_svm.hpp +++ b/src/ml/supervised_learning/linear_svm.hpp @@ -7,12 +7,13 @@ #define TURI_CLASS_LINEAR_SVM_H_ // ML-Data Utils +#include #include #include // Toolkits -#include -#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/linear_svm_opt_interface.cpp b/src/ml/supervised_learning/linear_svm_opt_interface.cpp similarity index 96% rename from src/toolkits/supervised_learning/linear_svm_opt_interface.cpp rename to src/ml/supervised_learning/linear_svm_opt_interface.cpp index 32281b5834..e0a1467672 100644 --- a/src/toolkits/supervised_learning/linear_svm_opt_interface.cpp +++ b/src/ml/supervised_learning/linear_svm_opt_interface.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data +#include #include #include #include @@ -12,9 +13,9 @@ #include // Toolkits -#include -#include -#include +#include +#include +#include // Solvers #include @@ -27,8 +28,8 @@ #include #include -#include -#include +#include +#include // Utilities #include diff --git a/src/toolkits/supervised_learning/linear_svm_opt_interface.hpp b/src/ml/supervised_learning/linear_svm_opt_interface.hpp similarity index 96% rename from src/toolkits/supervised_learning/linear_svm_opt_interface.hpp rename to src/ml/supervised_learning/linear_svm_opt_interface.hpp index a30b15b7a4..5cc1048ba1 100644 --- a/src/toolkits/supervised_learning/linear_svm_opt_interface.hpp +++ b/src/ml/supervised_learning/linear_svm_opt_interface.hpp @@ -7,12 +7,13 @@ #define TURI_CLASS_LINEAR_SVM_OPT_INTERFACE_H_ // ML-Data Utils +#include #include // Toolkits -#include -#include -#include +#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/logistic_regression.cpp b/src/ml/supervised_learning/logistic_regression.cpp similarity index 99% rename from src/toolkits/supervised_learning/logistic_regression.cpp rename to src/ml/supervised_learning/logistic_regression.cpp index 10e3071827..ee8db48bf5 100644 --- a/src/toolkits/supervised_learning/logistic_regression.cpp +++ b/src/ml/supervised_learning/logistic_regression.cpp @@ -7,17 +7,18 @@ // otherwise at least CHECK() collides with incompatible implementation. // ML Data +#include #include #include #include #include // Toolkits -#include -#include +#include +#include // Core ML -#include +#include // Solvers #include diff --git a/src/toolkits/supervised_learning/logistic_regression.hpp b/src/ml/supervised_learning/logistic_regression.hpp similarity index 97% rename from src/toolkits/supervised_learning/logistic_regression.hpp rename to src/ml/supervised_learning/logistic_regression.hpp index b8ba60d33f..527a688b66 100644 --- a/src/toolkits/supervised_learning/logistic_regression.hpp +++ b/src/ml/supervised_learning/logistic_regression.hpp @@ -7,11 +7,12 @@ #define TURI_REGR_LOGISTIC_REGRESSION_H_ // ML-Data Utils +#include #include // Toolkits -#include -#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/logistic_regression_opt_interface.cpp b/src/ml/supervised_learning/logistic_regression_opt_interface.cpp similarity index 98% rename from src/toolkits/supervised_learning/logistic_regression_opt_interface.cpp rename to src/ml/supervised_learning/logistic_regression_opt_interface.cpp index d120fdaf0e..e1f55c47a1 100644 --- a/src/toolkits/supervised_learning/logistic_regression_opt_interface.cpp +++ b/src/ml/supervised_learning/logistic_regression_opt_interface.cpp @@ -4,14 +4,15 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data +#include #include #include #include // Toolkits -#include -#include -#include +#include +#include +#include // Solvers #include diff --git a/src/toolkits/supervised_learning/logistic_regression_opt_interface.hpp b/src/ml/supervised_learning/logistic_regression_opt_interface.hpp similarity index 96% rename from src/toolkits/supervised_learning/logistic_regression_opt_interface.hpp rename to src/ml/supervised_learning/logistic_regression_opt_interface.hpp index a9dbb27a62..16cad53876 100644 --- a/src/toolkits/supervised_learning/logistic_regression_opt_interface.hpp +++ b/src/ml/supervised_learning/logistic_regression_opt_interface.hpp @@ -7,12 +7,13 @@ #define TURI_REGR_LOGISTIC_REGRESSION_OPT_INTERFACE_H_ // ML-Data Utils +#include #include // Toolkits -#include -#include -#include +#include +#include +#include // Optimization Interface #include diff --git a/src/toolkits/supervised_learning/random_forest.cpp b/src/ml/supervised_learning/random_forest.cpp similarity index 98% rename from src/toolkits/supervised_learning/random_forest.cpp rename to src/ml/supervised_learning/random_forest.cpp index 925e350a9a..8f2384ece0 100644 --- a/src/toolkits/supervised_learning/random_forest.cpp +++ b/src/ml/supervised_learning/random_forest.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/supervised_learning/random_forest.hpp b/src/ml/supervised_learning/random_forest.hpp similarity index 96% rename from src/toolkits/supervised_learning/random_forest.hpp rename to src/ml/supervised_learning/random_forest.hpp index 69f5f23a0c..f2d58ddd98 100644 --- a/src/toolkits/supervised_learning/random_forest.hpp +++ b/src/ml/supervised_learning/random_forest.hpp @@ -7,8 +7,9 @@ #define TURI_RANDOM_FOREST_H_ // unity xgboost -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/supervised_learning/standardization-inl.hpp b/src/ml/supervised_learning/standardization-inl.hpp similarity index 99% rename from src/toolkits/supervised_learning/standardization-inl.hpp rename to src/ml/supervised_learning/standardization-inl.hpp index ca285c5bc6..99f368f635 100644 --- a/src/toolkits/supervised_learning/standardization-inl.hpp +++ b/src/ml/supervised_learning/standardization-inl.hpp @@ -7,6 +7,7 @@ #define TURI_STANDARDIZATION_H_ #include +#include #include // Eigen diff --git a/src/toolkits/supervised_learning/supervised_learning.cpp b/src/ml/supervised_learning/supervised_learning.cpp similarity index 99% rename from src/toolkits/supervised_learning/supervised_learning.cpp rename to src/ml/supervised_learning/supervised_learning.cpp index 4df2548d32..b19a1a7fd7 100644 --- a/src/toolkits/supervised_learning/supervised_learning.cpp +++ b/src/ml/supervised_learning/supervised_learning.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include @@ -15,17 +16,17 @@ // Toolkits #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // ML Data #include // Evaluation -#include +#include namespace turi { namespace supervised { diff --git a/src/toolkits/supervised_learning/supervised_learning.hpp b/src/ml/supervised_learning/supervised_learning.hpp similarity index 99% rename from src/toolkits/supervised_learning/supervised_learning.hpp rename to src/ml/supervised_learning/supervised_learning.hpp index c993813c73..31cb30fd28 100644 --- a/src/toolkits/supervised_learning/supervised_learning.hpp +++ b/src/ml/supervised_learning/supervised_learning.hpp @@ -7,6 +7,7 @@ #define TURI_SUPERVISED_LEARNING_H_ // SFrame +#include #include #include #include @@ -23,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/toolkits/supervised_learning/supervised_learning_utils-inl.hpp b/src/ml/supervised_learning/supervised_learning_utils-inl.hpp similarity index 99% rename from src/toolkits/supervised_learning/supervised_learning_utils-inl.hpp rename to src/ml/supervised_learning/supervised_learning_utils-inl.hpp index 322fc4acc9..ac5d2ccb05 100644 --- a/src/toolkits/supervised_learning/supervised_learning_utils-inl.hpp +++ b/src/ml/supervised_learning/supervised_learning_utils-inl.hpp @@ -8,6 +8,7 @@ #include // SFrame +#include #include #include @@ -16,7 +17,7 @@ #include #include // Supervised learning includes. -#include +#include // Types #include diff --git a/src/toolkits/supervised_learning/xgboost.cpp b/src/ml/supervised_learning/xgboost.cpp similarity index 99% rename from src/toolkits/supervised_learning/xgboost.cpp rename to src/ml/supervised_learning/xgboost.cpp index 3e742ad77a..a83f334dbd 100644 --- a/src/toolkits/supervised_learning/xgboost.cpp +++ b/src/ml/supervised_learning/xgboost.cpp @@ -14,8 +14,9 @@ #undef MAX #endif -#include -#include +#include +#include +#include #include #include @@ -24,12 +25,12 @@ #include #include -#include +#include #include #include // CoreML -#include +#include // sframe @@ -41,8 +42,8 @@ #include // Toolkits -#include -#include +#include +#include namespace turi { namespace supervised { diff --git a/src/toolkits/supervised_learning/xgboost.hpp b/src/ml/supervised_learning/xgboost.hpp similarity index 98% rename from src/toolkits/supervised_learning/xgboost.hpp rename to src/ml/supervised_learning/xgboost.hpp index 43ad91b9c3..c5628e9b06 100644 --- a/src/toolkits/supervised_learning/xgboost.hpp +++ b/src/ml/supervised_learning/xgboost.hpp @@ -6,6 +6,7 @@ #ifndef TURI_XGBOOST_H_ #define TURI_XGBOOST_H_ // SFrame +#include #include #include #include @@ -15,13 +16,13 @@ #include // Utils -#include +#include #include #include // Toolkits -#include -#include +#include +#include // Forward delcare namespace xgboost { diff --git a/src/toolkits/supervised_learning/xgboost_error.cpp b/src/ml/supervised_learning/xgboost_error.cpp similarity index 98% rename from src/toolkits/supervised_learning/xgboost_error.cpp rename to src/ml/supervised_learning/xgboost_error.cpp index 2c666075f2..8c5404ad2d 100644 --- a/src/toolkits/supervised_learning/xgboost_error.cpp +++ b/src/ml/supervised_learning/xgboost_error.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include #include diff --git a/src/toolkits/supervised_learning/xgboost_extension.cpp b/src/ml/supervised_learning/xgboost_extension.cpp similarity index 93% rename from src/toolkits/supervised_learning/xgboost_extension.cpp rename to src/ml/supervised_learning/xgboost_extension.cpp index 2ff885a8dc..74d6626cd8 100644 --- a/src/toolkits/supervised_learning/xgboost_extension.cpp +++ b/src/ml/supervised_learning/xgboost_extension.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include +#include +#include using namespace turi; using namespace turi::supervised; diff --git a/src/toolkits/supervised_learning/xgboost_iterator.cpp b/src/ml/supervised_learning/xgboost_iterator.cpp similarity index 99% rename from src/toolkits/supervised_learning/xgboost_iterator.cpp rename to src/ml/supervised_learning/xgboost_iterator.cpp index 3d8a6142b8..7bebf67da4 100644 --- a/src/toolkits/supervised_learning/xgboost_iterator.cpp +++ b/src/ml/supervised_learning/xgboost_iterator.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/src/toolkits/supervised_learning/xgboost_iterator.hpp b/src/ml/supervised_learning/xgboost_iterator.hpp similarity index 94% rename from src/toolkits/supervised_learning/xgboost_iterator.hpp rename to src/ml/supervised_learning/xgboost_iterator.hpp index dfe897593c..60d57e7082 100644 --- a/src/toolkits/supervised_learning/xgboost_iterator.hpp +++ b/src/ml/supervised_learning/xgboost_iterator.hpp @@ -6,9 +6,10 @@ #ifndef TURI_XGBOOST_ITERATOR_H_ #define TURI_XGBOOST_ITERATOR_H_ +#include #include #include -#include +#include namespace turi { namespace supervised { diff --git a/src/toolkits/util/algorithmic_utils.hpp b/src/ml/util/algorithmic_utils.hpp similarity index 99% rename from src/toolkits/util/algorithmic_utils.hpp rename to src/ml/util/algorithmic_utils.hpp index cb87481083..53b3465b72 100644 --- a/src/toolkits/util/algorithmic_utils.hpp +++ b/src/ml/util/algorithmic_utils.hpp @@ -7,6 +7,7 @@ #define TURI_ALGORITHMIC_UTILS_H_ #include +#include #include namespace turi { diff --git a/src/toolkits/util/class_registrations.cpp b/src/ml/util/class_registrations.cpp similarity index 86% rename from src/toolkits/util/class_registrations.cpp rename to src/ml/util/class_registrations.cpp index e4aa959872..398ecfd7f3 100644 --- a/src/toolkits/util/class_registrations.cpp +++ b/src/ml/util/class_registrations.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include +#include +#include namespace turi { namespace util { diff --git a/src/toolkits/util/class_registrations.hpp b/src/ml/util/class_registrations.hpp similarity index 96% rename from src/toolkits/util/class_registrations.hpp rename to src/ml/util/class_registrations.hpp index 6a990dda26..8beeb52173 100644 --- a/src/toolkits/util/class_registrations.hpp +++ b/src/ml/util/class_registrations.hpp @@ -7,6 +7,7 @@ #define TURI_TOOLKIT_UTIL_REGISTRATIONS_H_ +#include #include #include diff --git a/src/toolkits/util/data_generators.cpp b/src/ml/util/data_generators.cpp similarity index 99% rename from src/toolkits/util/data_generators.cpp rename to src/ml/util/data_generators.cpp index 84a61a851f..75fa90ff60 100644 --- a/src/toolkits/util/data_generators.cpp +++ b/src/ml/util/data_generators.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/util/data_generators.hpp b/src/ml/util/data_generators.hpp similarity index 99% rename from src/toolkits/util/data_generators.hpp rename to src/ml/util/data_generators.hpp index f8500e06fd..334743208a 100644 --- a/src/toolkits/util/data_generators.hpp +++ b/src/ml/util/data_generators.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TESTING_DATA_GENERATORS_H_ #define TURI_TESTING_DATA_GENERATORS_H_ +#include #include #include #include diff --git a/src/toolkits/util/indexed_sframe_tools.cpp b/src/ml/util/indexed_sframe_tools.cpp similarity index 98% rename from src/toolkits/util/indexed_sframe_tools.cpp rename to src/ml/util/indexed_sframe_tools.cpp index 0221e089dd..e8715c9737 100644 --- a/src/toolkits/util/indexed_sframe_tools.cpp +++ b/src/ml/util/indexed_sframe_tools.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/util/indexed_sframe_tools.hpp b/src/ml/util/indexed_sframe_tools.hpp similarity index 98% rename from src/toolkits/util/indexed_sframe_tools.hpp rename to src/ml/util/indexed_sframe_tools.hpp index 834031d29f..0d371a9b37 100644 --- a/src/toolkits/util/indexed_sframe_tools.hpp +++ b/src/ml/util/indexed_sframe_tools.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace turi { diff --git a/src/toolkits/util/precision_recall.cpp b/src/ml/util/precision_recall.cpp similarity index 97% rename from src/toolkits/util/precision_recall.cpp rename to src/ml/util/precision_recall.cpp index cccd7aabbf..9213e18c33 100644 --- a/src/toolkits/util/precision_recall.cpp +++ b/src/ml/util/precision_recall.cpp @@ -8,9 +8,10 @@ #include #include #include +#include #include -#include -#include +#include +#include namespace turi { namespace recsys { diff --git a/src/toolkits/util/precision_recall.hpp b/src/ml/util/precision_recall.hpp similarity index 99% rename from src/toolkits/util/precision_recall.hpp rename to src/ml/util/precision_recall.hpp index 10238770f0..78751d4264 100644 --- a/src/toolkits/util/precision_recall.hpp +++ b/src/ml/util/precision_recall.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include namespace turi { namespace recsys { diff --git a/src/toolkits/util/random_sframe_generation.cpp b/src/ml/util/random_sframe_generation.cpp similarity index 99% rename from src/toolkits/util/random_sframe_generation.cpp rename to src/ml/util/random_sframe_generation.cpp index ce225dec0c..9ab9f8df53 100644 --- a/src/toolkits/util/random_sframe_generation.cpp +++ b/src/ml/util/random_sframe_generation.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/util/random_sframe_generation.hpp b/src/ml/util/random_sframe_generation.hpp similarity index 97% rename from src/toolkits/util/random_sframe_generation.hpp rename to src/ml/util/random_sframe_generation.hpp index fe4da2c66d..17fa7925b5 100644 --- a/src/toolkits/util/random_sframe_generation.hpp +++ b/src/ml/util/random_sframe_generation.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_RANDOM_SFRAME_GENERATION_H_ #define TURI_UNITY_RANDOM_SFRAME_GENERATION_H_ +#include #include #include #include diff --git a/src/toolkits/util/sframe_utils.cpp b/src/ml/util/sframe_utils.cpp similarity index 97% rename from src/toolkits/util/sframe_utils.cpp rename to src/ml/util/sframe_utils.cpp index 70d98d1243..c372edd523 100644 --- a/src/toolkits/util/sframe_utils.cpp +++ b/src/ml/util/sframe_utils.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include diff --git a/src/toolkits/util/sframe_utils.hpp b/src/ml/util/sframe_utils.hpp similarity index 99% rename from src/toolkits/util/sframe_utils.hpp rename to src/ml/util/sframe_utils.hpp index bc17a682f0..c10e98f73b 100644 --- a/src/toolkits/util/sframe_utils.hpp +++ b/src/ml/util/sframe_utils.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/util/spmat.hpp b/src/ml/util/spmat.hpp similarity index 99% rename from src/toolkits/util/spmat.hpp rename to src/ml/util/spmat.hpp index 554c02a281..1f4a260b51 100644 --- a/src/toolkits/util/spmat.hpp +++ b/src/ml/util/spmat.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/src/ml/util/training_utils.cpp b/src/ml/util/training_utils.cpp new file mode 100644 index 0000000000..177aafb5fa --- /dev/null +++ b/src/ml/util/training_utils.cpp @@ -0,0 +1,35 @@ +/* Copyright © 2019 Apple Inc. All rights reserved. + * + * Use of this source code is governed by a BSD-3-clause license that can + * be found in the LICENSE.txt file or at + * https://opensource.org/licenses/BSD-3-Clause + */ +#include +#include + +#include + +namespace turi { + +void print_training_device(std::vector gpu_names) { + if (gpu_names.empty()) { + logprogress_stream << "Using CPU to create model"; + } else { + std::string gpu_names_string = gpu_names[0]; + for (size_t i = 1; i < gpu_names.size(); ++i) { + gpu_names_string += ", " + gpu_names[i]; + } + // TODO: Use a better condition to distinguish between hardware + if (gpu_names_string.find("/") != std::string::npos) { + logprogress_stream << "Using " << gpu_names.size() + << (gpu_names.size() > 1 ? " GPUs" : " GPU") + << " to create model (CUDA)"; + + } else { + logprogress_stream << "Using " << (gpu_names.size() > 1 ? "GPUs" : "GPU") + << " to create model (" << gpu_names_string << ")"; + } + } +} + +} // namespace turi diff --git a/src/toolkits/util/training_utils.hpp b/src/ml/util/training_utils.hpp similarity index 90% rename from src/toolkits/util/training_utils.hpp rename to src/ml/util/training_utils.hpp index 3d4775f2af..998d51b59e 100644 --- a/src/toolkits/util/training_utils.hpp +++ b/src/ml/util/training_utils.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace turi { @@ -22,4 +23,4 @@ void print_training_device(std::vector gpu_names); } // namespace turi -#endif /* TURI_UTIL_TRAINING_H_ */ \ No newline at end of file +#endif /* TURI_UTIL_TRAINING_H_ */ diff --git a/src/toolkits/util/util.dox b/src/ml/util/util.dox similarity index 100% rename from src/toolkits/util/util.dox rename to src/ml/util/util.dox diff --git a/src/model_server/extensions/additional_sframe_utilities.cpp b/src/model_server/extensions/additional_sframe_utilities.cpp index 0f01ac8b24..5171dcc9d3 100644 --- a/src/model_server/extensions/additional_sframe_utilities.cpp +++ b/src/model_server/extensions/additional_sframe_utilities.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/model_server/extensions/additional_sframe_utilities.hpp b/src/model_server/extensions/additional_sframe_utilities.hpp index 35d157cb1e..7ceef06f64 100644 --- a/src/model_server/extensions/additional_sframe_utilities.hpp +++ b/src/model_server/extensions/additional_sframe_utilities.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_EXTENSIONS_ADDITIONAL_SFRAME_UTILITIES_HPP #define TURI_UNITY_EXTENSIONS_ADDITIONAL_SFRAME_UTILITIES_HPP +#include #include void sframe_load_to_numpy(turi::gl_sframe input, size_t outptr_addr, diff --git a/src/toolkits/feature_engineering/content_interpretation_extensions.cpp b/src/model_server/extensions/content_interpretation_extensions.cpp similarity index 97% rename from src/toolkits/feature_engineering/content_interpretation_extensions.cpp rename to src/model_server/extensions/content_interpretation_extensions.cpp index 38a9e9350f..71f87d95e7 100644 --- a/src/toolkits/feature_engineering/content_interpretation_extensions.cpp +++ b/src/model_server/extensions/content_interpretation_extensions.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/coreml_export/coreml_extension.cpp b/src/model_server/extensions/coreml_extension.cpp similarity index 89% rename from src/toolkits/coreml_export/coreml_extension.cpp rename to src/model_server/extensions/coreml_extension.cpp index d9c45dc2b6..98734f888b 100644 --- a/src/toolkits/coreml_export/coreml_extension.cpp +++ b/src/model_server/extensions/coreml_extension.cpp @@ -3,19 +3,25 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace turi; using namespace turi::supervised; using namespace turi::supervised::xgboost; +namespace turi { + namespace coreml_export { + + + /** Tree models * */ @@ -111,3 +117,5 @@ REGISTER_FUNCTION(_logistic_classifier_export_as_model_asset, "model", "filename", "context"); REGISTER_FUNCTION(_linear_regression_export_as_model_asset, "model", "filename", "context"); END_FUNCTION_REGISTRATION + +}} diff --git a/src/model_server/extensions/gpu_count.cpp b/src/model_server/extensions/gpu_count.cpp deleted file mode 100644 index ff5dad384f..0000000000 --- a/src/model_server/extensions/gpu_count.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright © 2017 Apple Inc. All rights reserved. - * - * Use of this source code is governed by a BSD-3-clause license that can - * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause - */ -#include -#include - -using namespace turi; - -int get_gpu_count() { - return supervised::neuralnet_v2::get_gpu_device_ids().size(); -} - -BEGIN_FUNCTION_REGISTRATION -REGISTER_FUNCTION(get_gpu_count) -END_FUNCTION_REGISTRATION diff --git a/src/model_server/extensions/grouped_sframe.cpp b/src/model_server/extensions/grouped_sframe.cpp index 725922db51..a716e8196d 100644 --- a/src/model_server/extensions/grouped_sframe.cpp +++ b/src/model_server/extensions/grouped_sframe.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/model_server/extensions/grouped_sframe.hpp b/src/model_server/extensions/grouped_sframe.hpp index 19df988fc0..ba61d52db7 100644 --- a/src/model_server/extensions/grouped_sframe.hpp +++ b/src/model_server/extensions/grouped_sframe.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GROUPED_SFRAME_HPP #define TURI_GROUPED_SFRAME_HPP +#include #include #include #include diff --git a/src/model_server/extensions/internal_demo.cpp b/src/model_server/extensions/internal_demo.cpp index c2c2e4c165..478d5128a6 100644 --- a/src/model_server/extensions/internal_demo.cpp +++ b/src/model_server/extensions/internal_demo.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/model_server/extensions/json/decoder.cpp b/src/model_server/extensions/json/decoder.cpp index 452969ba43..efb980d388 100644 --- a/src/model_server/extensions/json/decoder.cpp +++ b/src/model_server/extensions/json/decoder.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "decoder.hpp" #include "types.hpp" diff --git a/src/model_server/extensions/json/decoder.hpp b/src/model_server/extensions/json/decoder.hpp index c1757e937c..ee4e7ef539 100644 --- a/src/model_server/extensions/json/decoder.hpp +++ b/src/model_server/extensions/json/decoder.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/model_server/extensions/json/encoder.cpp b/src/model_server/extensions/json/encoder.cpp index 52c3f7c86a..eb45e3409f 100644 --- a/src/model_server/extensions/json/encoder.cpp +++ b/src/model_server/extensions/json/encoder.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "encoder.hpp" #include "types.hpp" diff --git a/src/model_server/extensions/json/encoder.hpp b/src/model_server/extensions/json/encoder.hpp index cc05bd1dac..06d7b53c82 100644 --- a/src/model_server/extensions/json/encoder.hpp +++ b/src/model_server/extensions/json/encoder.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/model_server/extensions/json/json.cpp b/src/model_server/extensions/json/json.cpp index b6988a48d8..f12d30c593 100644 --- a/src/model_server/extensions/json/json.cpp +++ b/src/model_server/extensions/json/json.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "decoder.hpp" #include "encoder.hpp" diff --git a/src/model_server/extensions/json/types.hpp b/src/model_server/extensions/json/types.hpp index 28337ae7f5..08c67f8997 100644 --- a/src/model_server/extensions/json/types.hpp +++ b/src/model_server/extensions/json/types.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include namespace turi { namespace JSON { diff --git a/src/model_server/extensions/timeseries/grouped_timeseries.cpp b/src/model_server/extensions/timeseries/grouped_timeseries.cpp index d98143243a..1751cb08fd 100644 --- a/src/model_server/extensions/timeseries/grouped_timeseries.cpp +++ b/src/model_server/extensions/timeseries/grouped_timeseries.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/extensions/timeseries/grouped_timeseries.hpp b/src/model_server/extensions/timeseries/grouped_timeseries.hpp index 718802d510..05c571c415 100644 --- a/src/model_server/extensions/timeseries/grouped_timeseries.hpp +++ b/src/model_server/extensions/timeseries/grouped_timeseries.hpp @@ -6,6 +6,7 @@ #ifndef TURI_GROUPED_TIMESERIES_HPP #define TURI_GROUPED_TIMESERIES_HPP +#include #include #include #include diff --git a/src/model_server/extensions/timeseries/interpolate_value.hpp b/src/model_server/extensions/timeseries/interpolate_value.hpp index ac40cb3288..df164b5fab 100644 --- a/src/model_server/extensions/timeseries/interpolate_value.hpp +++ b/src/model_server/extensions/timeseries/interpolate_value.hpp @@ -6,6 +6,7 @@ #ifndef RESAMPLE_INTERPOLATE_VALUE_H #define RESAMPLE_INTERPOLATE_VALUE_H +#include #include namespace turi { diff --git a/src/model_server/extensions/timeseries/registration.cpp b/src/model_server/extensions/timeseries/registration.cpp index 776dcae2ac..3dbadf73cf 100644 --- a/src/model_server/extensions/timeseries/registration.cpp +++ b/src/model_server/extensions/timeseries/registration.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/extensions/timeseries/registration.hpp b/src/model_server/extensions/timeseries/registration.hpp index bb864e4159..6d792793de 100644 --- a/src/model_server/extensions/timeseries/registration.hpp +++ b/src/model_server/extensions/timeseries/registration.hpp @@ -6,6 +6,7 @@ #ifndef TIMESERIES_REGISTRATIONS_H_ #define TIMESERIES_REGISTRATIONS_H_ +#include #include #include #include diff --git a/src/model_server/extensions/timeseries/timeseries.cpp b/src/model_server/extensions/timeseries/timeseries.cpp index f8cc4045b4..7b4e8e3bcf 100644 --- a/src/model_server/extensions/timeseries/timeseries.cpp +++ b/src/model_server/extensions/timeseries/timeseries.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include diff --git a/src/model_server/extensions/timeseries/timeseries.hpp b/src/model_server/extensions/timeseries/timeseries.hpp index da124c2d26..a1ede4d952 100644 --- a/src/model_server/extensions/timeseries/timeseries.hpp +++ b/src/model_server/extensions/timeseries/timeseries.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/transform_to_flat_dict_extensions.cpp b/src/model_server/extensions/transform_to_flat_dict_extensions.cpp similarity index 98% rename from src/toolkits/feature_engineering/transform_to_flat_dict_extensions.cpp rename to src/model_server/extensions/transform_to_flat_dict_extensions.cpp index 592cff98dc..e1084543b5 100644 --- a/src/toolkits/feature_engineering/transform_to_flat_dict_extensions.cpp +++ b/src/model_server/extensions/transform_to_flat_dict_extensions.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/api/client_base_types.hpp b/src/model_server/lib/api/client_base_types.hpp index 74aa65a313..1f6a682adc 100644 --- a/src/model_server/lib/api/client_base_types.hpp +++ b/src/model_server/lib/api/client_base_types.hpp @@ -10,6 +10,7 @@ * This file is a meta-header which includes all the types necessary * for the client library. */ +#include #include #include #include diff --git a/src/model_server/lib/api/function_closure_info.cpp b/src/model_server/lib/api/function_closure_info.cpp index 17362a1de1..4fb7f79d80 100644 --- a/src/model_server/lib/api/function_closure_info.cpp +++ b/src/model_server/lib/api/function_closure_info.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/api/function_closure_info.hpp b/src/model_server/lib/api/function_closure_info.hpp index 278fd139a3..76e3bddfad 100644 --- a/src/model_server/lib/api/function_closure_info.hpp +++ b/src/model_server/lib/api/function_closure_info.hpp @@ -6,6 +6,7 @@ // this file should not be included directly // due to circular include issues with variant.hpp // instead. we redirect to variant.hpp which will then include this again. +#include #include #ifndef TURI_UNITY_LIB_API_FUNCTION_CLOSURE_INFO_HPP #define TURI_UNITY_LIB_API_FUNCTION_CLOSURE_INFO_HPP diff --git a/src/model_server/lib/api/unity_global_interface.hpp b/src/model_server/lib/api/unity_global_interface.hpp index 1283a60c37..d53a4f0dcb 100644 --- a/src/model_server/lib/api/unity_global_interface.hpp +++ b/src/model_server/lib/api/unity_global_interface.hpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/api/unity_graph_interface.hpp b/src/model_server/lib/api/unity_graph_interface.hpp index e211574056..b39a3ec476 100644 --- a/src/model_server/lib/api/unity_graph_interface.hpp +++ b/src/model_server/lib/api/unity_graph_interface.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/api/unity_sarray_builder_interface.hpp b/src/model_server/lib/api/unity_sarray_builder_interface.hpp index a17734a012..499c1b1007 100644 --- a/src/model_server/lib/api/unity_sarray_builder_interface.hpp +++ b/src/model_server/lib/api/unity_sarray_builder_interface.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SARRAY_BUILDER_INTERFACE_HPP #define TURI_UNITY_SARRAY_BUILDER_INTERFACE_HPP #include +#include #include #include diff --git a/src/model_server/lib/api/unity_sarray_interface.hpp b/src/model_server/lib/api/unity_sarray_interface.hpp index 8f93029a11..d8a756f6c3 100644 --- a/src/model_server/lib/api/unity_sarray_interface.hpp +++ b/src/model_server/lib/api/unity_sarray_interface.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/api/unity_sframe_builder_interface.hpp b/src/model_server/lib/api/unity_sframe_builder_interface.hpp index 5459351bcc..79f3c5cb6b 100644 --- a/src/model_server/lib/api/unity_sframe_builder_interface.hpp +++ b/src/model_server/lib/api/unity_sframe_builder_interface.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_SFRAME_BUILDER_INTERFACE_HPP #include #include +#include #include #include diff --git a/src/model_server/lib/api/unity_sframe_interface.hpp b/src/model_server/lib/api/unity_sframe_interface.hpp index d7e80afa97..a9dcdf6232 100644 --- a/src/model_server/lib/api/unity_sframe_interface.hpp +++ b/src/model_server/lib/api/unity_sframe_interface.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/api/unity_sketch_interface.hpp b/src/model_server/lib/api/unity_sketch_interface.hpp index 806310137d..219a375bd9 100644 --- a/src/model_server/lib/api/unity_sketch_interface.hpp +++ b/src/model_server/lib/api/unity_sketch_interface.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/src/model_server/lib/auto_close_sarray.hpp b/src/model_server/lib/auto_close_sarray.hpp index aa4e8bf27c..40a7902ed3 100644 --- a/src/model_server/lib/auto_close_sarray.hpp +++ b/src/model_server/lib/auto_close_sarray.hpp @@ -46,3 +46,4 @@ class auto_close_sarrays { } #endif +#include diff --git a/src/model_server/lib/extensions/ml_model.cpp b/src/model_server/lib/extensions/ml_model.cpp index 054731dd74..253c2a63a8 100644 --- a/src/model_server/lib/extensions/ml_model.cpp +++ b/src/model_server/lib/extensions/ml_model.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/extensions/ml_model.hpp b/src/model_server/lib/extensions/ml_model.hpp index 47f9fa210e..80ece7eb67 100644 --- a/src/model_server/lib/extensions/ml_model.hpp +++ b/src/model_server/lib/extensions/ml_model.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_ML_MODEL_HPP #define TURI_UNITY_ML_MODEL_HPP +#include #include #include #include diff --git a/src/model_server/lib/extensions/model_base.cpp b/src/model_server/lib/extensions/model_base.cpp index d6ce016e74..e209261f8a 100644 --- a/src/model_server/lib/extensions/model_base.cpp +++ b/src/model_server/lib/extensions/model_base.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/extensions/model_base.hpp b/src/model_server/lib/extensions/model_base.hpp index 55cb6f039a..74952b3140 100644 --- a/src/model_server/lib/extensions/model_base.hpp +++ b/src/model_server/lib/extensions/model_base.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/model_server/lib/extensions/option_info.cpp b/src/model_server/lib/extensions/option_info.cpp index be14c10df9..87dbb5a13e 100644 --- a/src/model_server/lib/extensions/option_info.cpp +++ b/src/model_server/lib/extensions/option_info.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/extensions/option_info.hpp b/src/model_server/lib/extensions/option_info.hpp index 7c2979e552..89a8598ab3 100644 --- a/src/model_server/lib/extensions/option_info.hpp +++ b/src/model_server/lib/extensions/option_info.hpp @@ -8,6 +8,7 @@ #include #include +#include #include namespace turi { namespace option_handling { diff --git a/src/model_server/lib/extensions/option_manager.cpp b/src/model_server/lib/extensions/option_manager.cpp index 7a08e2e3aa..c674cdeda5 100644 --- a/src/model_server/lib/extensions/option_manager.cpp +++ b/src/model_server/lib/extensions/option_manager.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/extensions/option_manager.hpp b/src/model_server/lib/extensions/option_manager.hpp index b1e1e2cf57..94fa9bb19c 100644 --- a/src/model_server/lib/extensions/option_manager.hpp +++ b/src/model_server/lib/extensions/option_manager.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace turi { diff --git a/src/model_server/lib/flex_dict_view.cpp b/src/model_server/lib/flex_dict_view.cpp index e44e7035ad..0e43ad8d99 100644 --- a/src/model_server/lib/flex_dict_view.cpp +++ b/src/model_server/lib/flex_dict_view.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include diff --git a/src/model_server/lib/flex_dict_view.hpp b/src/model_server/lib/flex_dict_view.hpp index e2a9547ffa..539017abe7 100644 --- a/src/model_server/lib/flex_dict_view.hpp +++ b/src/model_server/lib/flex_dict_view.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_FLEX_DICT_HPP #include +#include #include namespace turi { diff --git a/src/model_server/lib/get_toolkit_function_from_closure.cpp b/src/model_server/lib/get_toolkit_function_from_closure.cpp index 05195a5900..c9b2631a4d 100644 --- a/src/model_server/lib/get_toolkit_function_from_closure.cpp +++ b/src/model_server/lib/get_toolkit_function_from_closure.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/image_util.cpp b/src/model_server/lib/image_util.cpp index f852e42017..6924416574 100644 --- a/src/model_server/lib/image_util.cpp +++ b/src/model_server/lib/image_util.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/image_util.hpp b/src/model_server/lib/image_util.hpp index 1c614ac2a6..10b32fb09c 100644 --- a/src/model_server/lib/image_util.hpp +++ b/src/model_server/lib/image_util.hpp @@ -6,6 +6,7 @@ #ifndef IMAGE_UTIL_HPP #define IMAGE_UTIL_HPP +#include #include #include diff --git a/src/model_server/lib/options_map.hpp b/src/model_server/lib/options_map.hpp index e4fb408296..00d075b090 100644 --- a/src/model_server/lib/options_map.hpp +++ b/src/model_server/lib/options_map.hpp @@ -14,3 +14,4 @@ namespace turi { typedef std::map options_map_t; } #endif +#include diff --git a/src/model_server/lib/sdk_registration_function_types.hpp b/src/model_server/lib/sdk_registration_function_types.hpp index a683ec456e..50432207a8 100644 --- a/src/model_server/lib/sdk_registration_function_types.hpp +++ b/src/model_server/lib/sdk_registration_function_types.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SDK_REGISTRATION_FUNCTION_TYPES_HPP #define TURI_UNITY_SDK_REGISTRATION_FUNCTION_TYPES_HPP #include +#include #include #include diff --git a/src/model_server/lib/sgraph_triple_apply_typedefs.hpp b/src/model_server/lib/sgraph_triple_apply_typedefs.hpp index 4e2112c763..7f2ab39997 100644 --- a/src/model_server/lib/sgraph_triple_apply_typedefs.hpp +++ b/src/model_server/lib/sgraph_triple_apply_typedefs.hpp @@ -6,8 +6,9 @@ #ifndef TURI_UNITY_SGRAPH_TRIPLE_APPLY_TYPEDEFS_HPP #define TURI_UNITY_SGRAPH_TRIPLE_APPLY_TYPEDEFS_HPP -#include -#include +#include +#include +#include namespace turi { diff --git a/src/model_server/lib/simple_model.cpp b/src/model_server/lib/simple_model.cpp index 8545634eaf..226a318955 100644 --- a/src/model_server/lib/simple_model.cpp +++ b/src/model_server/lib/simple_model.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/simple_model.hpp b/src/model_server/lib/simple_model.hpp index 59564dd21b..4559a0f628 100644 --- a/src/model_server/lib/simple_model.hpp +++ b/src/model_server/lib/simple_model.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SIMPLE_MODEL_HPP #define TURI_UNITY_SIMPLE_MODEL_HPP +#include #include #include diff --git a/src/model_server/lib/toolkit_class_macros.hpp b/src/model_server/lib/toolkit_class_macros.hpp index b35c9d5c1a..dc1bd322c3 100644 --- a/src/model_server/lib/toolkit_class_macros.hpp +++ b/src/model_server/lib/toolkit_class_macros.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_TOOLKIT_CLASS_MACROS_HPP #define TURI_UNITY_TOOLKIT_CLASS_MACROS_HPP #include +#include #include #include #include diff --git a/src/model_server/lib/toolkit_class_registry.cpp b/src/model_server/lib/toolkit_class_registry.cpp index 3defbdb505..4a332c312e 100644 --- a/src/model_server/lib/toolkit_class_registry.cpp +++ b/src/model_server/lib/toolkit_class_registry.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/toolkit_class_registry.hpp b/src/model_server/lib/toolkit_class_registry.hpp index 673d5c5489..607bf6b27f 100644 --- a/src/model_server/lib/toolkit_class_registry.hpp +++ b/src/model_server/lib/toolkit_class_registry.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_TOOLKIT_CLASS_REGISTRY_HPP #define TURI_UNITY_TOOLKIT_CLASS_REGISTRY_HPP +#include #include namespace turi { diff --git a/src/model_server/lib/toolkit_class_specification.hpp b/src/model_server/lib/toolkit_class_specification.hpp index 381d0a527b..b5acc28499 100644 --- a/src/model_server/lib/toolkit_class_specification.hpp +++ b/src/model_server/lib/toolkit_class_specification.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_LIB_TOOLKIT_CLASS_SPECIFICATION_HPP #include +#include #include namespace turi { class model_base; diff --git a/src/model_server/lib/toolkit_class_wrapper_impl.hpp b/src/model_server/lib/toolkit_class_wrapper_impl.hpp index 16b7aa454a..34dc85a61b 100644 --- a/src/model_server/lib/toolkit_class_wrapper_impl.hpp +++ b/src/model_server/lib/toolkit_class_wrapper_impl.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_TOOLKIT_CLASS_WRAPPER_IMPL_HPP #define TURI_UNITY_TOOLKIT_CLASS_WRAPPER_IMPL_HPP +#include #include namespace turi { diff --git a/src/model_server/lib/toolkit_function_invocation.hpp b/src/model_server/lib/toolkit_function_invocation.hpp index ab663c7c74..a817ea4350 100644 --- a/src/model_server/lib/toolkit_function_invocation.hpp +++ b/src/model_server/lib/toolkit_function_invocation.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_TOOLKIT_INVOCATION_HPP #include #include +#include #include #include namespace turi { diff --git a/src/model_server/lib/toolkit_function_macros.hpp b/src/model_server/lib/toolkit_function_macros.hpp index 681858c916..aa2080d0aa 100644 --- a/src/model_server/lib/toolkit_function_macros.hpp +++ b/src/model_server/lib/toolkit_function_macros.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_TOOLKIT_FUNCTION_MACROS_HPP #define TURI_UNITY_TOOLKIT_FUNCTION_MACROS_HPP +#include #include #include #include diff --git a/src/model_server/lib/toolkit_function_registry.cpp b/src/model_server/lib/toolkit_function_registry.cpp index 7a1f6c2b73..2121e766b8 100644 --- a/src/model_server/lib/toolkit_function_registry.cpp +++ b/src/model_server/lib/toolkit_function_registry.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/toolkit_function_registry.hpp b/src/model_server/lib/toolkit_function_registry.hpp index 5ea80bf5d2..c8abd6417b 100644 --- a/src/model_server/lib/toolkit_function_registry.hpp +++ b/src/model_server/lib/toolkit_function_registry.hpp @@ -7,6 +7,7 @@ #define TURI_TOOLKIT_FUNCTION_REGISTRY_HPP #include #include +#include #include #include namespace turi { diff --git a/src/model_server/lib/toolkit_function_response.hpp b/src/model_server/lib/toolkit_function_response.hpp index a731e73526..42c276737d 100644 --- a/src/model_server/lib/toolkit_function_response.hpp +++ b/src/model_server/lib/toolkit_function_response.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_TOOLKIT_RESPONSE_TYPE_HPP #define TURI_UNITY_TOOLKIT_RESPONSE_TYPE_HPP #include +#include #include #include diff --git a/src/model_server/lib/toolkit_function_specification.hpp b/src/model_server/lib/toolkit_function_specification.hpp index c8bc96867e..17c7e3aedf 100644 --- a/src/model_server/lib/toolkit_function_specification.hpp +++ b/src/model_server/lib/toolkit_function_specification.hpp @@ -7,6 +7,7 @@ #define TURI_TOOLKIT_FUNCTION_SPECIFICATION_HPP #include #include +#include #include #include namespace turi { diff --git a/src/model_server/lib/toolkit_function_wrapper_impl.hpp b/src/model_server/lib/toolkit_function_wrapper_impl.hpp index 8f50ee359a..eff2f50760 100644 --- a/src/model_server/lib/toolkit_function_wrapper_impl.hpp +++ b/src/model_server/lib/toolkit_function_wrapper_impl.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TOOLKIT_FUNCTION_WRAPPER_IMPL_HPP #define TURI_TOOLKIT_FUNCTION_WRAPPER_IMPL_HPP #include +#include #include #include #include diff --git a/src/model_server/lib/toolkit_util.hpp b/src/model_server/lib/toolkit_util.hpp index 6518f205e1..69efb6a866 100644 --- a/src/model_server/lib/toolkit_util.hpp +++ b/src/model_server/lib/toolkit_util.hpp @@ -8,6 +8,7 @@ #define TURI_UNITY_TOOLKIT_UTIL_HPP #include #include +#include #include /* diff --git a/src/model_server/lib/unity_base_types.hpp b/src/model_server/lib/unity_base_types.hpp index 372ff84fe8..f8095618c8 100644 --- a/src/model_server/lib/unity_base_types.hpp +++ b/src/model_server/lib/unity_base_types.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_BASE_TYPES_HPP #define TURI_UNITY_BASE_TYPES_HPP #include +#include #include #include #include diff --git a/src/model_server/lib/unity_global.cpp b/src/model_server/lib/unity_global.cpp index b0e24e55dc..fb1abe21c6 100644 --- a/src/model_server/lib/unity_global.cpp +++ b/src/model_server/lib/unity_global.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #ifndef _WIN32 +#include #include #else -#include +#include #endif #include @@ -24,7 +25,7 @@ #endif #include #include -#include +#include #include #include #include diff --git a/src/model_server/lib/unity_global.hpp b/src/model_server/lib/unity_global.hpp index 254b827124..8607481e62 100644 --- a/src/model_server/lib/unity_global.hpp +++ b/src/model_server/lib/unity_global.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_GLOBAL_HPP #define TURI_UNITY_GLOBAL_HPP +#include #include #include #include diff --git a/src/model_server/lib/unity_global_singleton.cpp b/src/model_server/lib/unity_global_singleton.cpp index 11cba7290d..7ba94f11cb 100644 --- a/src/model_server/lib/unity_global_singleton.cpp +++ b/src/model_server/lib/unity_global_singleton.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/model_server/lib/unity_global_singleton.hpp b/src/model_server/lib/unity_global_singleton.hpp index 9fa2d89dd9..bc76f2c800 100644 --- a/src/model_server/lib/unity_global_singleton.hpp +++ b/src/model_server/lib/unity_global_singleton.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_GLOBAL_SINGLETON_HPP #include +#include #include namespace turi { diff --git a/src/model_server/lib/variant.cpp b/src/model_server/lib/variant.cpp index 0d32d3ddf6..47e07267aa 100644 --- a/src/model_server/lib/variant.cpp +++ b/src/model_server/lib/variant.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/variant.hpp b/src/model_server/lib/variant.hpp index 8b14a629db..904405e44c 100644 --- a/src/model_server/lib/variant.hpp +++ b/src/model_server/lib/variant.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/variant_converter.cpp b/src/model_server/lib/variant_converter.cpp index 853f71751f..163d7ef8ea 100644 --- a/src/model_server/lib/variant_converter.cpp +++ b/src/model_server/lib/variant_converter.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/variant_converter.hpp b/src/model_server/lib/variant_converter.hpp index a8cd8bfcdc..854e358e3b 100644 --- a/src/model_server/lib/variant_converter.hpp +++ b/src/model_server/lib/variant_converter.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/src/model_server/lib/variant_deep_serialize.cpp b/src/model_server/lib/variant_deep_serialize.cpp index dbd92bab1d..09a36e7960 100644 --- a/src/model_server/lib/variant_deep_serialize.cpp +++ b/src/model_server/lib/variant_deep_serialize.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/lib/variant_deep_serialize.hpp b/src/model_server/lib/variant_deep_serialize.hpp index 915bcef570..2337bfdbf7 100644 --- a/src/model_server/lib/variant_deep_serialize.hpp +++ b/src/model_server/lib/variant_deep_serialize.hpp @@ -6,6 +6,7 @@ #ifndef TURI_VARIANT_DEEP_SERIALIZE_H_ #define TURI_VARIANT_DEEP_SERIALIZE_H_ +#include #include namespace turi { diff --git a/src/model_server/lib/version.hpp b/src/model_server/lib/version.hpp index c0d89f1ee8..6ed7bd4707 100644 --- a/src/model_server/lib/version.hpp +++ b/src/model_server/lib/version.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_VERSION_HPP #define TURI_UNITY_VERSION_HPP +#include #include "version_number.hpp" #ifdef __UNITY_VERSION__ diff --git a/src/model_server/server/registration.cpp b/src/model_server/server/registration.cpp index 2e5c721fc3..27d1e27c0f 100644 --- a/src/model_server/server/registration.cpp +++ b/src/model_server/server/registration.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -23,14 +24,14 @@ #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include @@ -42,12 +43,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/src/model_server/server/registration.hpp b/src/model_server/server/registration.hpp index b310bb2cdd..2cd1806da6 100644 --- a/src/model_server/server/registration.hpp +++ b/src/model_server/server/registration.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_REGSTRATION_HPP_ #define TURI_UNITY_REGSTRATION_HPP_ +#include #include #include diff --git a/src/model_server/server/unity_server.cpp b/src/model_server/server/unity_server.cpp index b5b89eb5ef..9e0c0ea616 100644 --- a/src/model_server/server/unity_server.cpp +++ b/src/model_server/server/unity_server.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include diff --git a/src/model_server/server/unity_server.hpp b/src/model_server/server/unity_server.hpp index 507a6b560c..b54ae64dd5 100644 --- a/src/model_server/server/unity_server.hpp +++ b/src/model_server/server/unity_server.hpp @@ -6,6 +6,7 @@ #ifndef SFRAME_UNITY_SERVER_HPP #define SFRAME_UNITY_SERVER_HPP +#include #include #include #include "unity_server_options.hpp" diff --git a/src/model_server/server/unity_server_control.cpp b/src/model_server/server/unity_server_control.cpp index 3c61c16773..2f76061c25 100644 --- a/src/model_server/server/unity_server_control.cpp +++ b/src/model_server/server/unity_server_control.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/server/unity_server_control.hpp b/src/model_server/server/unity_server_control.hpp index ea938b18ec..e283451245 100644 --- a/src/model_server/server/unity_server_control.hpp +++ b/src/model_server/server/unity_server_control.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SERVER_CONTROL_H #define TURI_UNITY_SERVER_CONTROL_H +#include #include #include diff --git a/src/model_server/server/unity_server_init.cpp b/src/model_server/server/unity_server_init.cpp index 466d701cf0..19681765af 100644 --- a/src/model_server/server/unity_server_init.cpp +++ b/src/model_server/server/unity_server_init.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/model_server/server/unity_server_init.hpp b/src/model_server/server/unity_server_init.hpp index 6ce5f9f34c..03ef01f799 100644 --- a/src/model_server/server/unity_server_init.hpp +++ b/src/model_server/server/unity_server_init.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_SERVER_UNITY_SERVER_INIT_HPP #define TURI_UNITY_SERVER_UNITY_SERVER_INIT_HPP +#include #include #include diff --git a/src/model_server/server/unity_server_options.hpp b/src/model_server/server/unity_server_options.hpp index 93e1705c49..e9fe65200d 100644 --- a/src/model_server/server/unity_server_options.hpp +++ b/src/model_server/server/unity_server_options.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_SERVER_OPTIONS_HPP #include +#include namespace turi { diff --git a/src/python/dummy.c b/src/python/dummy.c index 79e86dc822..aa6536dd73 100644 --- a/src/python/dummy.c +++ b/src/python/dummy.c @@ -4,3 +4,4 @@ int main() } void initdummy() {} +#include diff --git a/src/python/setup.py b/src/python/setup.py index 0dbd17b75a..fcd5327b52 100644 --- a/src/python/setup.py +++ b/src/python/setup.py @@ -11,6 +11,8 @@ from setuptools import setup, find_packages, Extension from setuptools.dist import Distribution from setuptools.command.install import install +from Cython.Build import cythonize +from distutils.extension import Extension PACKAGE_NAME = "turicreate" VERSION = "6.4.1" # {{VERSION_STRING}} @@ -119,7 +121,8 @@ def do_not_install(require): sys.exit(1) -if __name__ == "__main__": +if __name__ == '__main__': + from distutils.util import get_platform classifiers = [ @@ -141,7 +144,13 @@ def do_not_install(require): "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Information Analysis", ] + + # Get the include directories. + include_dirs = os.environ.get('CPATH', '').split(';') + library_dirs = os.environ.get('LD_LIBRARY_PATH', '').split(';') + cur_platform = get_platform() + if cur_platform.startswith("macosx"): classifiers.append("Operating System :: MacOS :: MacOS X") elif cur_platform.startswith("linux"): @@ -164,6 +173,8 @@ def do_not_install(require): long_description = f.read().decode("utf-8") install_requires = [ + "coremltools==3.3", + "cython>=0.29", "decorator >= 4.0.9", "numpy", "pandas >= 0.23.2", @@ -215,6 +226,16 @@ def do_not_install(require): author_email="turi-create@group.apple.com", cmdclass=dict(install=InstallEngine), distclass=BinaryDistribution, + + ext_modules = cythonize([ + # Everything but primes.pyx is included here. + Extension("*", ["turicreate/_cython/*.pyx"], + include_dirs=include_dirs, + libraries=['TuriCore'], + library_dirs=library_dirs, + extra_compile_args=['-O3', '-DNDEBUG', '-std=c++11', '-w']), + ]), + package_data={ "turicreate": [ "_cython/*.so", diff --git a/src/python/turicreate/_cython/cy_callback.pxd b/src/python/turicreate/_cython/cy_callback.pxd index a490580bd8..7e6a46d87a 100644 --- a/src/python/turicreate/_cython/cy_callback.pxd +++ b/src/python/turicreate/_cython/cy_callback.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + """ Provides a translation layer for easing the use of callback functions between cython and the c++ layer. diff --git a/src/python/turicreate/_cython/cy_callback.pyx b/src/python/turicreate/_cython/cy_callback.pyx index a7a865a125..e96a260fd7 100644 --- a/src/python/turicreate/_cython/cy_callback.pyx +++ b/src/python/turicreate/_cython/cy_callback.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.string cimport string import traceback diff --git a/src/python/turicreate/_cython/cy_cpp_utils.pxd b/src/python/turicreate/_cython/cy_cpp_utils.pxd index 463b0c9c1d..b55c3ebfa5 100644 --- a/src/python/turicreate/_cython/cy_cpp_utils.pxd +++ b/src/python/turicreate/_cython/cy_cpp_utils.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.string cimport string from libcpp.vector cimport vector from libcpp.map cimport map diff --git a/src/python/turicreate/_cython/cy_cpp_utils.pyx b/src/python/turicreate/_cython/cy_cpp_utils.pyx index ee6108fddb..7836e708fd 100644 --- a/src/python/turicreate/_cython/cy_cpp_utils.pyx +++ b/src/python/turicreate/_cython/cy_cpp_utils.pyx @@ -4,6 +4,9 @@ # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause +# distutils: language = c++ + + from libcpp.string cimport string from cpython.version cimport PY_MAJOR_VERSION diff --git a/src/python/turicreate/_cython/cy_dataframe.pxd b/src/python/turicreate/_cython/cy_dataframe.pxd index 9b4d19e532..7f41b106b5 100644 --- a/src/python/turicreate/_cython/cy_dataframe.pxd +++ b/src/python/turicreate/_cython/cy_dataframe.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.vector cimport vector from libcpp.string cimport string from libcpp.map cimport map diff --git a/src/python/turicreate/_cython/cy_dataframe.pyx b/src/python/turicreate/_cython/cy_dataframe.pyx index 2d2b072867..c7a12849f7 100644 --- a/src/python/turicreate/_cython/cy_dataframe.pyx +++ b/src/python/turicreate/_cython/cy_dataframe.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport common_typed_flex_list_from_iterable from .cy_flexible_type cimport pylist_from_flex_list from .cy_flexible_type cimport pytype_from_flex_type_enum diff --git a/src/python/turicreate/_cython/cy_flexible_type.pxd b/src/python/turicreate/_cython/cy_flexible_type.pxd index e18aba50b2..589d3c79b3 100644 --- a/src/python/turicreate/_cython/cy_flexible_type.pxd +++ b/src/python/turicreate/_cython/cy_flexible_type.pxd @@ -4,6 +4,9 @@ # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause +# distutils: language = c++ + + #cython libcpp types from libcpp.vector cimport vector from libcpp.string cimport string diff --git a/src/python/turicreate/_cython/cy_flexible_type.pyx b/src/python/turicreate/_cython/cy_flexible_type.pyx index 13c7ecf998..2199bc6fbd 100644 --- a/src/python/turicreate/_cython/cy_flexible_type.pyx +++ b/src/python/turicreate/_cython/cy_flexible_type.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + ''' There are essentially three tasks that need to be done in flexible_type translation; each of these are implemented in this file. diff --git a/src/python/turicreate/_cython/cy_graph.pxd b/src/python/turicreate/_cython/cy_graph.pxd index 994fee3ad1..df051089ce 100644 --- a/src/python/turicreate/_cython/cy_graph.pxd +++ b/src/python/turicreate/_cython/cy_graph.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flex_list from .cy_flexible_type cimport gl_options_map from .cy_flexible_type cimport flex_type_enum diff --git a/src/python/turicreate/_cython/cy_graph.pyx b/src/python/turicreate/_cython/cy_graph.pyx index 056a29c4dc..6e15e98693 100644 --- a/src/python/turicreate/_cython/cy_graph.pyx +++ b/src/python/turicreate/_cython/cy_graph.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from cython.operator cimport dereference as deref from .cy_flexible_type cimport pytype_from_flex_type_enum diff --git a/src/python/turicreate/_cython/cy_model.pxd b/src/python/turicreate/_cython/cy_model.pxd index 4223e50c3e..0253066da5 100644 --- a/src/python/turicreate/_cython/cy_model.pxd +++ b/src/python/turicreate/_cython/cy_model.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.map cimport map from libcpp.vector cimport vector from libcpp.string cimport string diff --git a/src/python/turicreate/_cython/cy_model.pyx b/src/python/turicreate/_cython/cy_model.pyx index 4651822c58..83f4e5835e 100644 --- a/src/python/turicreate/_cython/cy_model.pyx +++ b/src/python/turicreate/_cython/cy_model.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_variant cimport to_value from .cy_variant cimport from_dict as variant_map_from_dict from .cy_cpp_utils cimport str_to_cpp,\ diff --git a/src/python/turicreate/_cython/cy_pylambda_workers.pyx b/src/python/turicreate/_cython/cy_pylambda_workers.pyx index f1eba46b67..c4637c4d12 100644 --- a/src/python/turicreate/_cython/cy_pylambda_workers.pyx +++ b/src/python/turicreate/_cython/cy_pylambda_workers.pyx @@ -5,6 +5,9 @@ # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause #cython: boundscheck=False, wraparound=False +# distutils: language = c++ + + from cy_flexible_type cimport flexible_type, flex_type_enum, UNDEFINED, flex_int from cy_flexible_type cimport flexible_type_from_pyobject from cy_flexible_type cimport process_common_typed_list diff --git a/src/python/turicreate/_cython/cy_sarray.pxd b/src/python/turicreate/_cython/cy_sarray.pxd index a40bd3aa93..98ef44c362 100644 --- a/src/python/turicreate/_cython/cy_sarray.pxd +++ b/src/python/turicreate/_cython/cy_sarray.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flex_type_enum from .cy_flexible_type cimport flexible_type from .cy_flexible_type cimport flex_list diff --git a/src/python/turicreate/_cython/cy_sarray.pyx b/src/python/turicreate/_cython/cy_sarray.pyx index 1a937322f0..2dd96a9902 100644 --- a/src/python/turicreate/_cython/cy_sarray.pyx +++ b/src/python/turicreate/_cython/cy_sarray.pyx @@ -4,6 +4,9 @@ # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause +# distutils: language = c++ + + ### cython utils ### from cython.operator cimport dereference as deref diff --git a/src/python/turicreate/_cython/cy_sarray_builder.pxd b/src/python/turicreate/_cython/cy_sarray_builder.pxd index f5124853ff..8b67ac4883 100644 --- a/src/python/turicreate/_cython/cy_sarray_builder.pxd +++ b/src/python/turicreate/_cython/cy_sarray_builder.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flex_type_enum from .cy_flexible_type cimport flexible_type from libcpp.vector cimport vector diff --git a/src/python/turicreate/_cython/cy_sarray_builder.pyx b/src/python/turicreate/_cython/cy_sarray_builder.pyx index 8f38978fe4..68b2160b6d 100644 --- a/src/python/turicreate/_cython/cy_sarray_builder.pyx +++ b/src/python/turicreate/_cython/cy_sarray_builder.pyx @@ -4,6 +4,9 @@ # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause +# distutils: language = c++ + + from .cy_unity_base_types cimport * from .cy_flexible_type cimport flex_list diff --git a/src/python/turicreate/_cython/cy_server.pyx b/src/python/turicreate/_cython/cy_server.pyx index 8920f861a3..7b50d07c02 100644 --- a/src/python/turicreate/_cython/cy_server.pyx +++ b/src/python/turicreate/_cython/cy_server.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + """ This module contains the interface for turicreate server, and the implementation of a local turicreate server. diff --git a/src/python/turicreate/_cython/cy_sframe.pxd b/src/python/turicreate/_cython/cy_sframe.pxd index face64f25d..a90608648d 100644 --- a/src/python/turicreate/_cython/cy_sframe.pxd +++ b/src/python/turicreate/_cython/cy_sframe.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flexible_type from .cy_flexible_type cimport flex_type_enum from .cy_flexible_type cimport flex_list diff --git a/src/python/turicreate/_cython/cy_sframe.pyx b/src/python/turicreate/_cython/cy_sframe.pyx index d168ff1182..393da09651 100644 --- a/src/python/turicreate/_cython/cy_sframe.pyx +++ b/src/python/turicreate/_cython/cy_sframe.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.pair cimport pair from cython.operator cimport dereference as deref diff --git a/src/python/turicreate/_cython/cy_sframe_builder.pxd b/src/python/turicreate/_cython/cy_sframe_builder.pxd index b61bd53513..2ca2507bae 100644 --- a/src/python/turicreate/_cython/cy_sframe_builder.pxd +++ b/src/python/turicreate/_cython/cy_sframe_builder.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flex_type_enum from .cy_flexible_type cimport flexible_type from libcpp.vector cimport vector diff --git a/src/python/turicreate/_cython/cy_sframe_builder.pyx b/src/python/turicreate/_cython/cy_sframe_builder.pyx index 115ae4ca51..f67c857eef 100644 --- a/src/python/turicreate/_cython/cy_sframe_builder.pyx +++ b/src/python/turicreate/_cython/cy_sframe_builder.pyx @@ -4,6 +4,9 @@ # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause +# distutils: language = c++ + + ### cython utils ### from cython.operator cimport dereference as deref diff --git a/src/python/turicreate/_cython/cy_sketch.pxd b/src/python/turicreate/_cython/cy_sketch.pxd index f63803d63f..85f52cbbc3 100644 --- a/src/python/turicreate/_cython/cy_sketch.pxd +++ b/src/python/turicreate/_cython/cy_sketch.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flexible_type from .cy_sarray cimport UnitySArrayProxy from libcpp.vector cimport vector diff --git a/src/python/turicreate/_cython/cy_sketch.pyx b/src/python/turicreate/_cython/cy_sketch.pyx index ee23dba380..e112216ec6 100644 --- a/src/python/turicreate/_cython/cy_sketch.pyx +++ b/src/python/turicreate/_cython/cy_sketch.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from cython.operator cimport dereference as deref from cython.operator cimport preincrement as inc from .cy_flexible_type cimport flex_list diff --git a/src/python/turicreate/_cython/cy_test_utils.pxd b/src/python/turicreate/_cython/cy_test_utils.pxd index 6d95b8b0c8..815138c8ab 100644 --- a/src/python/turicreate/_cython/cy_test_utils.pxd +++ b/src/python/turicreate/_cython/cy_test_utils.pxd @@ -3,5 +3,8 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + cdef extern from "stdlib.h": void abort() diff --git a/src/python/turicreate/_cython/cy_test_utils.pyx b/src/python/turicreate/_cython/cy_test_utils.pyx index b5058ce9ec..abb583ab12 100644 --- a/src/python/turicreate/_cython/cy_test_utils.pyx +++ b/src/python/turicreate/_cython/cy_test_utils.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + import sys import time diff --git a/src/python/turicreate/_cython/cy_unity.pxd b/src/python/turicreate/_cython/cy_unity.pxd index aa22aca425..b1c6e6a32e 100644 --- a/src/python/turicreate/_cython/cy_unity.pxd +++ b/src/python/turicreate/_cython/cy_unity.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_flexible_type cimport flexible_type from .cy_flexible_type cimport flex_list from .cy_flexible_type cimport gl_options_map diff --git a/src/python/turicreate/_cython/cy_unity.pyx b/src/python/turicreate/_cython/cy_unity.pyx index a4fcced70b..d63a7702b0 100644 --- a/src/python/turicreate/_cython/cy_unity.pyx +++ b/src/python/turicreate/_cython/cy_unity.pyx @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from .cy_variant cimport variant_type from .cy_variant cimport variant_map_type_iterator from .cy_variant cimport from_dict as variant_map_from_dict diff --git a/src/python/turicreate/_cython/cy_unity_base_types.pxd b/src/python/turicreate/_cython/cy_unity_base_types.pxd index d966be2b1e..a809f89d83 100644 --- a/src/python/turicreate/_cython/cy_unity_base_types.pxd +++ b/src/python/turicreate/_cython/cy_unity_base_types.pxd @@ -3,6 +3,9 @@ # # Use of this source code is governed by a BSD-3-clause license that can # be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause + +# distutils: language = c++ + from libcpp.map cimport map from libcpp.vector cimport vector from libcpp.string cimport string diff --git a/src/python/turicreate/_cython/cython_cpp_error_handler.hpp b/src/python/turicreate/_cython/cython_cpp_error_handler.hpp index e694bd8239..bdd1503e2a 100644 --- a/src/python/turicreate/_cython/cython_cpp_error_handler.hpp +++ b/src/python/turicreate/_cython/cython_cpp_error_handler.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #define PY_SSIZE_T_CLEAN +#include #include #include #include diff --git a/src/ml/neural_net/tf_compute_context.cpp b/src/python/turicreate/cpp/tf_compute_context.cpp similarity index 99% rename from src/ml/neural_net/tf_compute_context.cpp rename to src/python/turicreate/cpp/tf_compute_context.cpp index 81d04f950f..b6ee32925c 100644 --- a/src/ml/neural_net/tf_compute_context.cpp +++ b/src/python/turicreate/cpp/tf_compute_context.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -349,7 +350,7 @@ std::unique_ptr tf_compute_context::create_activity_classifier( std::unique_ptr tf_compute_context::create_image_augmenter( const image_augmenter::options& opts) { std::unique_ptr result; - + call_pybind_function([&]() { const size_t output_height = opts.output_height; diff --git a/src/ml/neural_net/tf_compute_context.hpp b/src/python/turicreate/cpp/tf_compute_context.hpp similarity index 98% rename from src/ml/neural_net/tf_compute_context.hpp rename to src/python/turicreate/cpp/tf_compute_context.hpp index 5ba8bcd665..e6cf6c19c8 100644 --- a/src/ml/neural_net/tf_compute_context.hpp +++ b/src/python/turicreate/cpp/tf_compute_context.hpp @@ -7,6 +7,7 @@ #ifndef UNITY_TOOLKITS_NEURAL_NET_TF_COMPUTE_CONTEXT_HPP_ #define UNITY_TOOLKITS_NEURAL_NET_TF_COMPUTE_CONTEXT_HPP_ +#include #include #include @@ -50,7 +51,7 @@ EXPORT class tf_compute_context: public compute_context { std::unique_ptr create_image_augmenter( const image_augmenter::options &opts) override; - + }; } // namespace neural_net diff --git a/src/toolkits/CMakeLists.txt b/src/toolkits/CMakeLists.txt deleted file mode 100644 index a58983cde3..0000000000 --- a/src/toolkits/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -subdirs(activity_classification -clustering -coreml_export -drawing_classifier -evaluation -factorization -feature_engineering -graph_analytics -image -image_deep_feature_extractor -ml_data_2 -ml_model -nearest_neighbors -object_detection -pattern_mining -prototype -recsys -sgd -sparse_similarity -style_transfer -supervised_learning -text -util) diff --git a/src/toolkits/activity_classification/CMakeLists.txt b/src/toolkits/activity_classification/CMakeLists.txt deleted file mode 100644 index cd8bfd20c1..0000000000 --- a/src/toolkits/activity_classification/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(Turi) - -make_library(unity_activity_classification OBJECT - SOURCES - ac_data_iterator.cpp - activity_classifier.cpp - class_registrations.cpp - REQUIRES - unity_core - unity_ml_model -) diff --git a/src/toolkits/activity_classification/ac_data_iterator.cpp b/src/toolkits/activity_classification/ac_data_iterator.cpp index 3b5ae31ecc..dbda34d344 100644 --- a/src/toolkits/activity_classification/ac_data_iterator.cpp +++ b/src/toolkits/activity_classification/ac_data_iterator.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -296,12 +297,6 @@ variant_map_type _activity_classifier_prepare_data_aug_impl( } #endif - for (std::string feat : features) { - if (!data.contains_column(feat)) { - log_and_throw("Column name " + feat + " does not exist."); - } - } - bool use_target = (target != ""); DASSERT_TRUE(!use_target || data.contains_column(target)); diff --git a/src/toolkits/activity_classification/ac_data_iterator.hpp b/src/toolkits/activity_classification/ac_data_iterator.hpp index fbbd21494c..e2842acf65 100644 --- a/src/toolkits/activity_classification/ac_data_iterator.hpp +++ b/src/toolkits/activity_classification/ac_data_iterator.hpp @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/activity_classification/activity_classifier.cpp b/src/toolkits/activity_classification/activity_classifier.cpp index 76ffc764cf..943b05812b 100644 --- a/src/toolkits/activity_classification/activity_classifier.cpp +++ b/src/toolkits/activity_classification/activity_classifier.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -16,11 +17,13 @@ #include #include #include +#include +#include +#include +#include #include -#include #include #include -#include namespace turi { namespace activity_classification { diff --git a/src/toolkits/activity_classification/activity_classifier.hpp b/src/toolkits/activity_classification/activity_classifier.hpp index f70fb8fab6..976d3bf542 100644 --- a/src/toolkits/activity_classification/activity_classifier.hpp +++ b/src/toolkits/activity_classification/activity_classifier.hpp @@ -6,11 +6,12 @@ #ifndef TURI_ACTIVITY_CLASSIFIER_H_ #define TURI_ACTIVITY_CLASSIFIER_H_ +#include #include #include #include #include -#include +#include #include #include #include diff --git a/src/toolkits/activity_classification/class_registrations.cpp b/src/toolkits/activity_classification/class_registrations.cpp index 9596c81629..6c87d115df 100644 --- a/src/toolkits/activity_classification/class_registrations.cpp +++ b/src/toolkits/activity_classification/class_registrations.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/activity_classification/class_registrations.hpp b/src/toolkits/activity_classification/class_registrations.hpp index 2226910c2c..e2d43a190f 100644 --- a/src/toolkits/activity_classification/class_registrations.hpp +++ b/src/toolkits/activity_classification/class_registrations.hpp @@ -8,6 +8,7 @@ #include +#include #include #include diff --git a/src/toolkits/clustering/CMakeLists.txt b/src/toolkits/clustering/CMakeLists.txt deleted file mode 100644 index 5366bd7052..0000000000 --- a/src/toolkits/clustering/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -project(Turi) - -make_library(unity_clustering OBJECT - SOURCES - kmeans.cpp - class_registrations.cpp - unity_kmeans.cpp - REQUIRES - unity_core - unity_ml_model - unity_ml_data_2 -) diff --git a/src/toolkits/clustering/class_registrations.cpp b/src/toolkits/clustering/class_registrations.cpp index f234a57ad1..c87e40594e 100644 --- a/src/toolkits/clustering/class_registrations.cpp +++ b/src/toolkits/clustering/class_registrations.cpp @@ -1,3 +1,4 @@ +#include #include namespace turi { namespace kmeans { diff --git a/src/toolkits/clustering/class_registrations.hpp b/src/toolkits/clustering/class_registrations.hpp index 64e8bdf34b..de1e5d27a0 100644 --- a/src/toolkits/clustering/class_registrations.hpp +++ b/src/toolkits/clustering/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_CLUSTERING_REGISTRATIONS #define TURI_CLUSTERING_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/clustering/include.hpp b/src/toolkits/clustering/include.hpp index 2cd36a800d..110b801efd 100644 --- a/src/toolkits/clustering/include.hpp +++ b/src/toolkits/clustering/include.hpp @@ -6,6 +6,7 @@ #ifndef UNITY_CLUSTERING_INCLUDE_HPP #define UNITY_CLUSTERING_INCLUDE_HPP +#include #include "kmeans.hpp" #endif diff --git a/src/toolkits/clustering/kmeans.cpp b/src/toolkits/clustering/kmeans.cpp index f3ed4c1ac6..9367b96432 100644 --- a/src/toolkits/clustering/kmeans.cpp +++ b/src/toolkits/clustering/kmeans.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/toolkits/clustering/kmeans.hpp b/src/toolkits/clustering/kmeans.hpp index 91a9a9edb8..9d15ed479f 100644 --- a/src/toolkits/clustering/kmeans.hpp +++ b/src/toolkits/clustering/kmeans.hpp @@ -9,6 +9,7 @@ // Types #include #include +#include #include #include #include @@ -19,15 +20,15 @@ #include // ML Data utils -#include -#include +#include +#include // Interfaces #include #include #include #include -#include +#include // Miscellaneous #include diff --git a/src/toolkits/clustering/unity_kmeans.cpp b/src/toolkits/clustering/unity_kmeans.cpp index bfa5d7ad42..69860c282a 100644 --- a/src/toolkits/clustering/unity_kmeans.cpp +++ b/src/toolkits/clustering/unity_kmeans.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // Data structures +#include #include #include #include diff --git a/src/toolkits/clustering/unity_kmeans.hpp b/src/toolkits/clustering/unity_kmeans.hpp index 3d48726faf..2352890b93 100644 --- a/src/toolkits/clustering/unity_kmeans.hpp +++ b/src/toolkits/clustering/unity_kmeans.hpp @@ -8,6 +8,7 @@ #include +#include #include #include diff --git a/src/toolkits/coreml_export/CMakeLists.txt b/src/toolkits/coreml_export/CMakeLists.txt deleted file mode 100644 index f6a7a90716..0000000000 --- a/src/toolkits/coreml_export/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -project(Turi) - -make_library(unity_coreml_model_export OBJECT - SOURCES - mldata_exporter.cpp - xgboost_exporter.cpp - linear_models_exporter.cpp - neural_net_models_exporter.cpp - coreml_export_utils.cpp - mlmodel_wrapper.cpp - REQUIRES - eigen - protobuf - coremltools_mlmodel) diff --git a/src/toolkits/drawing_classifier/CMakeLists.txt b/src/toolkits/drawing_classifier/CMakeLists.txt deleted file mode 100644 index 73487a4d00..0000000000 --- a/src/toolkits/drawing_classifier/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -project(Turi) - -make_library(unity_drawing_classifier OBJECT -SOURCES - class_registrations.cpp - data_preparation.cpp - dc_data_iterator.cpp - drawing_classifier.cpp -REQUIRES - unity_core - unity_ml_model -) diff --git a/src/toolkits/drawing_classifier/class_registrations.cpp b/src/toolkits/drawing_classifier/class_registrations.cpp index f3d12e6fd0..98869d514b 100644 --- a/src/toolkits/drawing_classifier/class_registrations.cpp +++ b/src/toolkits/drawing_classifier/class_registrations.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/drawing_classifier/class_registrations.hpp b/src/toolkits/drawing_classifier/class_registrations.hpp index 43b3e442b9..8172fdc49c 100644 --- a/src/toolkits/drawing_classifier/class_registrations.hpp +++ b/src/toolkits/drawing_classifier/class_registrations.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DRAWING_REGISTRATION_H_ #define TURI_DRAWING_REGISTRATION_H_ +#include #include namespace turi { diff --git a/src/toolkits/drawing_classifier/data_preparation.cpp b/src/toolkits/drawing_classifier/data_preparation.cpp index 6a65c4f258..dd29d371a0 100644 --- a/src/toolkits/drawing_classifier/data_preparation.cpp +++ b/src/toolkits/drawing_classifier/data_preparation.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/toolkits/drawing_classifier/data_preparation.hpp b/src/toolkits/drawing_classifier/data_preparation.hpp index 479d122a0c..d41b81af2d 100644 --- a/src/toolkits/drawing_classifier/data_preparation.hpp +++ b/src/toolkits/drawing_classifier/data_preparation.hpp @@ -6,6 +6,7 @@ #ifndef TURI_DRAWING_DATA_PREPARATION_H_ #define TURI_DRAWING_DATA_PREPARATION_H_ +#include #include #include #include diff --git a/src/toolkits/drawing_classifier/dc_data_iterator.cpp b/src/toolkits/drawing_classifier/dc_data_iterator.cpp index 49111553e9..cee190bc15 100644 --- a/src/toolkits/drawing_classifier/dc_data_iterator.cpp +++ b/src/toolkits/drawing_classifier/dc_data_iterator.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/drawing_classifier/dc_data_iterator.hpp b/src/toolkits/drawing_classifier/dc_data_iterator.hpp index 4ccbbde117..8be3c5b09d 100644 --- a/src/toolkits/drawing_classifier/dc_data_iterator.hpp +++ b/src/toolkits/drawing_classifier/dc_data_iterator.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/drawing_classifier/drawing_classifier.cpp b/src/toolkits/drawing_classifier/drawing_classifier.cpp index 7130bd0381..44ef2585a7 100644 --- a/src/toolkits/drawing_classifier/drawing_classifier.cpp +++ b/src/toolkits/drawing_classifier/drawing_classifier.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -16,6 +17,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/drawing_classifier/drawing_classifier.hpp b/src/toolkits/drawing_classifier/drawing_classifier.hpp index ae55506c3d..43a8db3327 100644 --- a/src/toolkits/drawing_classifier/drawing_classifier.hpp +++ b/src/toolkits/drawing_classifier/drawing_classifier.hpp @@ -7,6 +7,7 @@ #ifndef TURI_DRAWING_CLASSIFIER_H_ #define TURI_DRAWING_CLASSIFIER_H_ +#include #include #include #include @@ -14,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include namespace turi { diff --git a/src/toolkits/evaluation/CMakeLists.txt b/src/toolkits/evaluation/CMakeLists.txt deleted file mode 100644 index 4ea231e963..0000000000 --- a/src/toolkits/evaluation/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(Turi) - -make_library(unity_evaluation OBJECT - SOURCES - metrics.cpp - unity_evaluation.cpp - REQUIRES - ml_data - unity_core - unity_recsys -) diff --git a/src/toolkits/factorization/CMakeLists.txt b/src/toolkits/factorization/CMakeLists.txt deleted file mode 100644 index a9dd0804fa..0000000000 --- a/src/toolkits/factorization/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -project(Turi) - -make_library(unity_factorization OBJECT - SOURCES - factory_instantiations/basic_sgd_squared_error.cpp - factory_instantiations/basic_sgd_logistic.cpp - factory_instantiations/ranking_squared_error.cpp - factory_instantiations/ranking_logistic.cpp - model_factory.cpp - factorization_model_serialization.cpp - factorization_model.cpp - factorization_model_options.cpp - loss_model_profiles.cpp - factorization_model_training.cpp - REQUIRES - unity_ml_data_2 unity_sgd eigen -) -add_dependencies(unity_factorization boost) diff --git a/src/toolkits/feature_engineering/CMakeLists.txt b/src/toolkits/feature_engineering/CMakeLists.txt deleted file mode 100644 index 863fe923b5..0000000000 --- a/src/toolkits/feature_engineering/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -project(Turi) - -make_library(unity_feature_engineering OBJECT - SOURCES - class_registrations.cpp - dict_transform_utils.cpp - transform_to_flat_dictionary.cpp - one_hot_encoder.cpp - feature_binner.cpp - sample_transformer.cpp - dimension_reduction.cpp - quadratic_features.cpp - topk_indexer.cpp - statistics_tracker.cpp - count_thresholder.cpp - mean_imputer.cpp - bm25.cpp - tfidf.cpp - tokenizer.cpp - categorical_imputer.cpp - word_counter.cpp - ngram_counter.cpp - count_featurizer.cpp - word_trimmer.cpp - content_interpretation.cpp - REQUIRES - unity_core - unity_clustering - unity_graph_analytics - unity_ml_model -) diff --git a/src/toolkits/feature_engineering/bm25.cpp b/src/toolkits/feature_engineering/bm25.cpp index 4a8af49277..2f9fb2414b 100644 --- a/src/toolkits/feature_engineering/bm25.cpp +++ b/src/toolkits/feature_engineering/bm25.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/bm25.hpp b/src/toolkits/feature_engineering/bm25.hpp index 99857cc73a..062ca3aabb 100644 --- a/src/toolkits/feature_engineering/bm25.hpp +++ b/src/toolkits/feature_engineering/bm25.hpp @@ -6,6 +6,7 @@ #ifndef _BM25_H_ #define _BM25_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/categorical_imputer.cpp b/src/toolkits/feature_engineering/categorical_imputer.cpp index 30b00c44b5..45be787b9d 100644 --- a/src/toolkits/feature_engineering/categorical_imputer.cpp +++ b/src/toolkits/feature_engineering/categorical_imputer.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/categorical_imputer.hpp b/src/toolkits/feature_engineering/categorical_imputer.hpp index 9beb5ade05..3164faceac 100644 --- a/src/toolkits/feature_engineering/categorical_imputer.hpp +++ b/src/toolkits/feature_engineering/categorical_imputer.hpp @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/class_registrations.cpp b/src/toolkits/feature_engineering/class_registrations.cpp index 75691ee8f7..23408df5eb 100644 --- a/src/toolkits/feature_engineering/class_registrations.cpp +++ b/src/toolkits/feature_engineering/class_registrations.cpp @@ -7,6 +7,7 @@ #define FEATURE_ENGINEERING_REGISTRATIONS_H_ +#include #include #include diff --git a/src/toolkits/feature_engineering/class_registrations.hpp b/src/toolkits/feature_engineering/class_registrations.hpp index 4d4ffb5a9d..70d3ef3c32 100644 --- a/src/toolkits/feature_engineering/class_registrations.hpp +++ b/src/toolkits/feature_engineering/class_registrations.hpp @@ -7,6 +7,7 @@ #define FEATURE_ENGINEERING_REGISTRATIONS_H_ +#include #include #include diff --git a/src/toolkits/feature_engineering/content_interpretation.cpp b/src/toolkits/feature_engineering/content_interpretation.cpp index c6ae8c7936..78052ba216 100644 --- a/src/toolkits/feature_engineering/content_interpretation.cpp +++ b/src/toolkits/feature_engineering/content_interpretation.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/content_interpretation.hpp b/src/toolkits/feature_engineering/content_interpretation.hpp index 239f60194b..b928ca8bd1 100644 --- a/src/toolkits/feature_engineering/content_interpretation.hpp +++ b/src/toolkits/feature_engineering/content_interpretation.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_TOOLKITS_CONTENT_INTERPRETATION_H #define TURI_UNITY_TOOLKITS_CONTENT_INTERPRETATION_H +#include #include #include diff --git a/src/toolkits/feature_engineering/count_featurizer.cpp b/src/toolkits/feature_engineering/count_featurizer.cpp index 0fc5686ee5..817587da57 100644 --- a/src/toolkits/feature_engineering/count_featurizer.cpp +++ b/src/toolkits/feature_engineering/count_featurizer.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/count_featurizer.hpp b/src/toolkits/feature_engineering/count_featurizer.hpp index e3fa3fe48e..9d8056ba38 100644 --- a/src/toolkits/feature_engineering/count_featurizer.hpp +++ b/src/toolkits/feature_engineering/count_featurizer.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_FEATURE_ENGINEERING_COUNT_FEATURIZER_HPP #define TURI_FEATURE_ENGINEERING_COUNT_FEATURIZER_HPP +#include #include #include #include diff --git a/src/toolkits/feature_engineering/count_thresholder.cpp b/src/toolkits/feature_engineering/count_thresholder.cpp index 226699fd8d..7b77ddef47 100644 --- a/src/toolkits/feature_engineering/count_thresholder.cpp +++ b/src/toolkits/feature_engineering/count_thresholder.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/count_thresholder.hpp b/src/toolkits/feature_engineering/count_thresholder.hpp index fe20b1a53b..f0eaf77dbc 100644 --- a/src/toolkits/feature_engineering/count_thresholder.hpp +++ b/src/toolkits/feature_engineering/count_thresholder.hpp @@ -6,6 +6,7 @@ #ifndef _count_thresholder_INDEXER_H_ #define _count_thresholder_INDEXER_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/dict_transform_utils.cpp b/src/toolkits/feature_engineering/dict_transform_utils.cpp index 604ff12d56..45e193ec7f 100644 --- a/src/toolkits/feature_engineering/dict_transform_utils.cpp +++ b/src/toolkits/feature_engineering/dict_transform_utils.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/dict_transform_utils.hpp b/src/toolkits/feature_engineering/dict_transform_utils.hpp index bf4a5b33c0..4e2e2d9f3b 100644 --- a/src/toolkits/feature_engineering/dict_transform_utils.hpp +++ b/src/toolkits/feature_engineering/dict_transform_utils.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/dimension_reduction.cpp b/src/toolkits/feature_engineering/dimension_reduction.cpp index 434bf11e9d..dffdd31ca2 100644 --- a/src/toolkits/feature_engineering/dimension_reduction.cpp +++ b/src/toolkits/feature_engineering/dimension_reduction.cpp @@ -4,12 +4,13 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include -#include +#include #include #include diff --git a/src/toolkits/feature_engineering/dimension_reduction.hpp b/src/toolkits/feature_engineering/dimension_reduction.hpp index fb3f0e1bb5..47c3886574 100644 --- a/src/toolkits/feature_engineering/dimension_reduction.hpp +++ b/src/toolkits/feature_engineering/dimension_reduction.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_DIMENSION_REDUCTION_H_ #define TURI_DIMENSION_REDUCTION_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/feature_binner.cpp b/src/toolkits/feature_engineering/feature_binner.cpp index 83e680185d..385b315f80 100644 --- a/src/toolkits/feature_engineering/feature_binner.cpp +++ b/src/toolkits/feature_engineering/feature_binner.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/feature_binner.hpp b/src/toolkits/feature_engineering/feature_binner.hpp index 88fe055034..68de378c08 100644 --- a/src/toolkits/feature_engineering/feature_binner.hpp +++ b/src/toolkits/feature_engineering/feature_binner.hpp @@ -6,6 +6,7 @@ #ifndef _FEATURE_BINNER_H_ #define _FEATURE_BINNER_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/mean_imputer.cpp b/src/toolkits/feature_engineering/mean_imputer.cpp index c364562c95..c0039cd462 100644 --- a/src/toolkits/feature_engineering/mean_imputer.cpp +++ b/src/toolkits/feature_engineering/mean_imputer.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/mean_imputer.hpp b/src/toolkits/feature_engineering/mean_imputer.hpp index 3899469285..d4c9f297fb 100644 --- a/src/toolkits/feature_engineering/mean_imputer.hpp +++ b/src/toolkits/feature_engineering/mean_imputer.hpp @@ -6,6 +6,7 @@ #ifndef _mean_imputer_INDEXER_H_ #define _mean_imputer_INDEXER_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/ngram_counter.cpp b/src/toolkits/feature_engineering/ngram_counter.cpp index f5773a14ad..db78ab2233 100644 --- a/src/toolkits/feature_engineering/ngram_counter.cpp +++ b/src/toolkits/feature_engineering/ngram_counter.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/ngram_counter.hpp b/src/toolkits/feature_engineering/ngram_counter.hpp index aad4497a70..5f3712ad63 100644 --- a/src/toolkits/feature_engineering/ngram_counter.hpp +++ b/src/toolkits/feature_engineering/ngram_counter.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_FE_ngram_counter_H_ #define TURI_FE_ngram_counter_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/one_hot_encoder.cpp b/src/toolkits/feature_engineering/one_hot_encoder.cpp index 8590eab75c..69eb49e8b6 100644 --- a/src/toolkits/feature_engineering/one_hot_encoder.cpp +++ b/src/toolkits/feature_engineering/one_hot_encoder.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/one_hot_encoder.hpp b/src/toolkits/feature_engineering/one_hot_encoder.hpp index 900f4597e1..c327e22095 100644 --- a/src/toolkits/feature_engineering/one_hot_encoder.hpp +++ b/src/toolkits/feature_engineering/one_hot_encoder.hpp @@ -6,6 +6,7 @@ #ifndef _ONE_HOT_ENCODER_INDEXER_H_ #define _ONE_HOT_ENCODER_INDEXER_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/quadratic_features.cpp b/src/toolkits/feature_engineering/quadratic_features.cpp index b6b3737bb1..bc5d12d089 100644 --- a/src/toolkits/feature_engineering/quadratic_features.cpp +++ b/src/toolkits/feature_engineering/quadratic_features.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/quadratic_features.hpp b/src/toolkits/feature_engineering/quadratic_features.hpp index 618078fb4e..b6ff04602a 100644 --- a/src/toolkits/feature_engineering/quadratic_features.hpp +++ b/src/toolkits/feature_engineering/quadratic_features.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_QUADRATIC_FEATURES_H_ #define TURI_QUADRATIC_FEATURES_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/sample_transformer.cpp b/src/toolkits/feature_engineering/sample_transformer.cpp index a6f251b147..1a66f0b135 100644 --- a/src/toolkits/feature_engineering/sample_transformer.cpp +++ b/src/toolkits/feature_engineering/sample_transformer.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/sample_transformer.hpp b/src/toolkits/feature_engineering/sample_transformer.hpp index d52b81513b..a28475fc93 100644 --- a/src/toolkits/feature_engineering/sample_transformer.hpp +++ b/src/toolkits/feature_engineering/sample_transformer.hpp @@ -6,6 +6,7 @@ #ifndef TURI_SAMPLE_TRANSFORMER_H_ #define TURI_SAMPLE_TRANSFORMER_H_ #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/statistics_tracker.cpp b/src/toolkits/feature_engineering/statistics_tracker.cpp index 2d9e0c8a6f..98645586e4 100644 --- a/src/toolkits/feature_engineering/statistics_tracker.cpp +++ b/src/toolkits/feature_engineering/statistics_tracker.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/statistics_tracker.hpp b/src/toolkits/feature_engineering/statistics_tracker.hpp index 14bcea566d..b85dd0ea6e 100644 --- a/src/toolkits/feature_engineering/statistics_tracker.hpp +++ b/src/toolkits/feature_engineering/statistics_tracker.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TOPK_STATISTICS_TRACKER_H_ #define TURI_TOPK_STATISTICS_TRACKER_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/tfidf.cpp b/src/toolkits/feature_engineering/tfidf.cpp index f3f7610ff3..3bf2d87911 100644 --- a/src/toolkits/feature_engineering/tfidf.cpp +++ b/src/toolkits/feature_engineering/tfidf.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/tfidf.hpp b/src/toolkits/feature_engineering/tfidf.hpp index 626c371de6..9c07164225 100644 --- a/src/toolkits/feature_engineering/tfidf.hpp +++ b/src/toolkits/feature_engineering/tfidf.hpp @@ -6,6 +6,7 @@ #ifndef _TFIDF_H_ #define _TFIDF_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/tokenizer.cpp b/src/toolkits/feature_engineering/tokenizer.cpp index e18f1208bd..5e460ef939 100644 --- a/src/toolkits/feature_engineering/tokenizer.cpp +++ b/src/toolkits/feature_engineering/tokenizer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/tokenizer.hpp b/src/toolkits/feature_engineering/tokenizer.hpp index 6a56e186ca..6ee8364659 100644 --- a/src/toolkits/feature_engineering/tokenizer.hpp +++ b/src/toolkits/feature_engineering/tokenizer.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_TEXT_TOKENIZER_H_ #define TURI_TEXT_TOKENIZER_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/topk_indexer.cpp b/src/toolkits/feature_engineering/topk_indexer.cpp index ad874b32d9..8352100b81 100644 --- a/src/toolkits/feature_engineering/topk_indexer.cpp +++ b/src/toolkits/feature_engineering/topk_indexer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/topk_indexer.hpp b/src/toolkits/feature_engineering/topk_indexer.hpp index 4977d77836..0196a1b943 100644 --- a/src/toolkits/feature_engineering/topk_indexer.hpp +++ b/src/toolkits/feature_engineering/topk_indexer.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TOPK_COLUMN_INDEXER_H_ #define TURI_TOPK_COLUMN_INDEXER_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/transform_to_flat_dictionary.cpp b/src/toolkits/feature_engineering/transform_to_flat_dictionary.cpp index aff65f936d..63399504b1 100644 --- a/src/toolkits/feature_engineering/transform_to_flat_dictionary.cpp +++ b/src/toolkits/feature_engineering/transform_to_flat_dictionary.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/transform_to_flat_dictionary.hpp b/src/toolkits/feature_engineering/transform_to_flat_dictionary.hpp index 5867c20176..a3275201fb 100644 --- a/src/toolkits/feature_engineering/transform_to_flat_dictionary.hpp +++ b/src/toolkits/feature_engineering/transform_to_flat_dictionary.hpp @@ -7,6 +7,7 @@ #define TURI_UNITY_TOOLKITS_TRANSFORM_TO_FLAT_DICT_HPP #include +#include #include #include #include diff --git a/src/toolkits/feature_engineering/transform_utils.hpp b/src/toolkits/feature_engineering/transform_utils.hpp index db544b2dac..e5fd6d9460 100644 --- a/src/toolkits/feature_engineering/transform_utils.hpp +++ b/src/toolkits/feature_engineering/transform_utils.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TRANSFORM_UTILS_H_ #define TURI_TRANSFORM_UTILS_H_ +#include #include #include diff --git a/src/toolkits/feature_engineering/transformer_base.hpp b/src/toolkits/feature_engineering/transformer_base.hpp index cacd20d6b1..37a0ebcbc7 100644 --- a/src/toolkits/feature_engineering/transformer_base.hpp +++ b/src/toolkits/feature_engineering/transformer_base.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TRANSFORMER_BASE_H #define TURI_TRANSFORMER_BASE_H +#include #include #include #include diff --git a/src/toolkits/feature_engineering/word_counter.cpp b/src/toolkits/feature_engineering/word_counter.cpp index 570f36b204..40894ea026 100644 --- a/src/toolkits/feature_engineering/word_counter.cpp +++ b/src/toolkits/feature_engineering/word_counter.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/word_counter.hpp b/src/toolkits/feature_engineering/word_counter.hpp index 53d389e61e..08a8552eab 100644 --- a/src/toolkits/feature_engineering/word_counter.hpp +++ b/src/toolkits/feature_engineering/word_counter.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_FE_WORD_COUNTER_H_ #define TURI_FE_WORD_COUNTER_H_ +#include #include #include #include diff --git a/src/toolkits/feature_engineering/word_trimmer.cpp b/src/toolkits/feature_engineering/word_trimmer.cpp index 782f2400ac..24de7d797e 100644 --- a/src/toolkits/feature_engineering/word_trimmer.cpp +++ b/src/toolkits/feature_engineering/word_trimmer.cpp @@ -5,6 +5,7 @@ */ #include #include +#include #include #include diff --git a/src/toolkits/feature_engineering/word_trimmer.hpp b/src/toolkits/feature_engineering/word_trimmer.hpp index f7852714ce..1361477c8a 100644 --- a/src/toolkits/feature_engineering/word_trimmer.hpp +++ b/src/toolkits/feature_engineering/word_trimmer.hpp @@ -6,6 +6,7 @@ #ifndef _WORD_TRIMMER_H_ #define _WORD_TRIMMER_H_ #include +#include #include #include #include diff --git a/src/toolkits/graph_analytics/CMakeLists.txt b/src/toolkits/graph_analytics/CMakeLists.txt deleted file mode 100644 index 870ba6db8c..0000000000 --- a/src/toolkits/graph_analytics/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -project(Turi) - -make_library(unity_graph_analytics OBJECT - SOURCES - kcore_sgraph.cpp - connected_component_sgraph.cpp - graph_coloring_sgraph.cpp - triangle_counting_sgraph.cpp - sssp_sgraph.cpp - pagerank_sgraph.cpp - degree_count.cpp - label_propagation.cpp - REQUIRES - unity_core -) diff --git a/src/toolkits/graph_analytics/connected_component.hpp b/src/toolkits/graph_analytics/connected_component.hpp index 6da209ccd7..cbbadf6d4f 100644 --- a/src/toolkits/graph_analytics/connected_component.hpp +++ b/src/toolkits/graph_analytics/connected_component.hpp @@ -5,6 +5,7 @@ */ #ifndef TURI_UNITY_CONNECTED_COMPONENT #define TURI_UNITY_CONNECTED_COMPONENT +#include #include namespace turi { diff --git a/src/toolkits/graph_analytics/connected_component_sgraph.cpp b/src/toolkits/graph_analytics/connected_component_sgraph.cpp index c45ef04c48..ff6bc11312 100644 --- a/src/toolkits/graph_analytics/connected_component_sgraph.cpp +++ b/src/toolkits/graph_analytics/connected_component_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/degree_count.cpp b/src/toolkits/graph_analytics/degree_count.cpp index 4d46c4d8b8..c0e469354c 100644 --- a/src/toolkits/graph_analytics/degree_count.cpp +++ b/src/toolkits/graph_analytics/degree_count.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/degree_count.hpp b/src/toolkits/graph_analytics/degree_count.hpp index 2deea804f2..cc655e4701 100644 --- a/src/toolkits/graph_analytics/degree_count.hpp +++ b/src/toolkits/graph_analytics/degree_count.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_DEGREE_COUNT #define TURI_UNITY_DEGREE_COUNT diff --git a/src/toolkits/graph_analytics/graph_coloring.hpp b/src/toolkits/graph_analytics/graph_coloring.hpp index 474c9009dd..d7fc522f01 100644 --- a/src/toolkits/graph_analytics/graph_coloring.hpp +++ b/src/toolkits/graph_analytics/graph_coloring.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_GRAPH_COLORING #define TURI_UNITY_GRAPH_COLORING diff --git a/src/toolkits/graph_analytics/graph_coloring_sgraph.cpp b/src/toolkits/graph_analytics/graph_coloring_sgraph.cpp index d73cfa88ee..edb7b412dc 100644 --- a/src/toolkits/graph_analytics/graph_coloring_sgraph.cpp +++ b/src/toolkits/graph_analytics/graph_coloring_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/include.hpp b/src/toolkits/graph_analytics/include.hpp index d437188d75..29997436be 100644 --- a/src/toolkits/graph_analytics/include.hpp +++ b/src/toolkits/graph_analytics/include.hpp @@ -6,6 +6,7 @@ #ifndef UNITY_GRAPH_ANALYTICS_INCLUDE_HPP #define UNITY_GRAPH_ANALYTICS_INCLUDE_HPP +#include #include "pagerank.hpp" #include "connected_component.hpp" #include "kcore.hpp" diff --git a/src/toolkits/graph_analytics/kcore.hpp b/src/toolkits/graph_analytics/kcore.hpp index 50538085f7..1f274b8eef 100644 --- a/src/toolkits/graph_analytics/kcore.hpp +++ b/src/toolkits/graph_analytics/kcore.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_KCORE #define TURI_UNITY_KCORE diff --git a/src/toolkits/graph_analytics/kcore_sgraph.cpp b/src/toolkits/graph_analytics/kcore_sgraph.cpp index 9cb82e0bd2..4f0af6d274 100644 --- a/src/toolkits/graph_analytics/kcore_sgraph.cpp +++ b/src/toolkits/graph_analytics/kcore_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/label_propagation.cpp b/src/toolkits/graph_analytics/label_propagation.cpp index 9f887e746e..34eacea450 100644 --- a/src/toolkits/graph_analytics/label_propagation.cpp +++ b/src/toolkits/graph_analytics/label_propagation.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/label_propagation.hpp b/src/toolkits/graph_analytics/label_propagation.hpp index fb9b87dae5..06cf67b396 100644 --- a/src/toolkits/graph_analytics/label_propagation.hpp +++ b/src/toolkits/graph_analytics/label_propagation.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_LABEL_PROPAGATION #define TURI_UNITY_LABEL_PROPAGATION diff --git a/src/toolkits/graph_analytics/pagerank.hpp b/src/toolkits/graph_analytics/pagerank.hpp index 173e580086..57d3152dbd 100644 --- a/src/toolkits/graph_analytics/pagerank.hpp +++ b/src/toolkits/graph_analytics/pagerank.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_PAGERANK #define TURI_UNITY_PAGERANK diff --git a/src/toolkits/graph_analytics/pagerank_sgraph.cpp b/src/toolkits/graph_analytics/pagerank_sgraph.cpp index 57b63f55a2..144d7f67c4 100644 --- a/src/toolkits/graph_analytics/pagerank_sgraph.cpp +++ b/src/toolkits/graph_analytics/pagerank_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/sssp.hpp b/src/toolkits/graph_analytics/sssp.hpp index 7b190d9ed1..f57881b77b 100644 --- a/src/toolkits/graph_analytics/sssp.hpp +++ b/src/toolkits/graph_analytics/sssp.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_SSSP #define TURI_UNITY_SSSP diff --git a/src/toolkits/graph_analytics/sssp_sgraph.cpp b/src/toolkits/graph_analytics/sssp_sgraph.cpp index 657d018783..8a7e59ab58 100644 --- a/src/toolkits/graph_analytics/sssp_sgraph.cpp +++ b/src/toolkits/graph_analytics/sssp_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/graph_analytics/triangle_counting.hpp b/src/toolkits/graph_analytics/triangle_counting.hpp index d64641cf5d..546958eafc 100644 --- a/src/toolkits/graph_analytics/triangle_counting.hpp +++ b/src/toolkits/graph_analytics/triangle_counting.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #ifndef TURI_UNITY_TRIANGLE_COUNTING #define TURI_UNITY_TRIANGLE_COUNTING diff --git a/src/toolkits/graph_analytics/triangle_counting_sgraph.cpp b/src/toolkits/graph_analytics/triangle_counting_sgraph.cpp index 706a8bd63c..afabeb578e 100644 --- a/src/toolkits/graph_analytics/triangle_counting_sgraph.cpp +++ b/src/toolkits/graph_analytics/triangle_counting_sgraph.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/image/CMakeLists.txt b/src/toolkits/image/CMakeLists.txt deleted file mode 100644 index fb50f65c49..0000000000 --- a/src/toolkits/image/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(Turi) - -make_library(unity_image_export OBJECT - SOURCES - image_fn_export.cpp - REQUIRES - unity_core - EXTERNAL_VISIBILITY -) diff --git a/src/toolkits/image/image_fn_export.cpp b/src/toolkits/image/image_fn_export.cpp index 57a6447ff8..320dad95b2 100644 --- a/src/toolkits/image/image_fn_export.cpp +++ b/src/toolkits/image/image_fn_export.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/image/image_fn_export.hpp b/src/toolkits/image/image_fn_export.hpp index be9b65459d..a5085f5e44 100644 --- a/src/toolkits/image/image_fn_export.hpp +++ b/src/toolkits/image/image_fn_export.hpp @@ -6,6 +6,7 @@ #ifndef IMAGE_FN_EXPORT_HPP #define IMAGE_FN_EXPORT_HPP +#include #include namespace turi{ diff --git a/src/toolkits/image_deep_feature_extractor/class_registrations.cpp b/src/toolkits/image_deep_feature_extractor/class_registrations.cpp index 737e5c3e20..d93a44d2f4 100644 --- a/src/toolkits/image_deep_feature_extractor/class_registrations.cpp +++ b/src/toolkits/image_deep_feature_extractor/class_registrations.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/toolkits/image_deep_feature_extractor/class_registrations.hpp b/src/toolkits/image_deep_feature_extractor/class_registrations.hpp index 7dc91f1a2b..f1bb0c791b 100644 --- a/src/toolkits/image_deep_feature_extractor/class_registrations.hpp +++ b/src/toolkits/image_deep_feature_extractor/class_registrations.hpp @@ -6,6 +6,7 @@ #ifndef TURI_IMAGE_DEEP_FEATURE_EXTRACTOR_REGISTRATIONS #define TURI_IMAGE_DEEP_FEATURE_EXTRACTOR_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.cpp b/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.cpp index 46ccdb4125..dd21f1863d 100644 --- a/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.cpp +++ b/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.hpp b/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.hpp index 287afa8a3e..2a879d27aa 100644 --- a/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.hpp +++ b/src/toolkits/image_deep_feature_extractor/image_deep_feature_extractor_toolkit.hpp @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/src/toolkits/image_deep_feature_extractor/image_feature_extractor.hpp b/src/toolkits/image_deep_feature_extractor/image_feature_extractor.hpp index 74f4d05c64..49ba89d26c 100644 --- a/src/toolkits/image_deep_feature_extractor/image_feature_extractor.hpp +++ b/src/toolkits/image_deep_feature_extractor/image_feature_extractor.hpp @@ -6,8 +6,9 @@ #ifndef IMAGE_FEATURE_EXTRACTOR_HPP #define IMAGE_FEATURE_EXTRACTOR_HPP +#include #include -#include +#include namespace turi { namespace image_deep_feature_extractor { diff --git a/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.hpp b/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.hpp index d2a7e4922b..a72d0eeb34 100644 --- a/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.hpp +++ b/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.hpp @@ -6,6 +6,7 @@ #ifndef MLMODEL_IMAGE_FEATURE_EXTRACTOR_HPP #define MLMODEL_IMAGE_FEATURE_EXTRACTOR_HPP +#include #include #include diff --git a/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.mm b/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.mm index d8da3846cf..6e04999d4f 100644 --- a/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.mm +++ b/src/toolkits/image_deep_feature_extractor/mlmodel_image_feature_extractor.mm @@ -13,7 +13,7 @@ #include #include #include -#include +#include #import #include diff --git a/src/toolkits/ml_data_2/CMakeLists.txt b/src/toolkits/ml_data_2/CMakeLists.txt deleted file mode 100644 index 6d6cf8d48c..0000000000 --- a/src/toolkits/ml_data_2/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -project(Turi) - -make_library(unity_ml_data_2 OBJECT - SOURCES - data_storage/ml_data_block_manager.cpp - ml_data.cpp - ml_data_column_modes.cpp - ml_data_missing_values.cpp - ml_data_sorting.cpp - ml_data_setup.cpp - - metadata.cpp - side_features.cpp - - data_storage/ml_data_row_format.cpp - data_storage/ml_data_row_translation.cpp - data_storage/internal_metadata.cpp - data_storage/util.cpp - - indexing/column_indexer.cpp - indexing/column_unique_indexer.cpp - statistics/column_statistics.cpp - statistics/basic_column_statistics.cpp - iterators/ml_data_iterator_base.cpp - iterators/ml_data_block_iterator.cpp - iterators/composite_row_type.cpp - - sframe_index_mapping.cpp - - testing_utils.cpp - - row_slicing_utilities.cpp - - REQUIRES - unity_core - unity_util - eigen -) diff --git a/src/toolkits/ml_model/CMakeLists.txt b/src/toolkits/ml_model/CMakeLists.txt deleted file mode 100644 index 36b7900426..0000000000 --- a/src/toolkits/ml_model/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -project(Turi) - -make_library(unity_ml_model OBJECT - SOURCES - python_model.cpp - REQUIRES - unity_core - optimization - boost -) diff --git a/src/toolkits/nearest_neighbors/CMakeLists.txt b/src/toolkits/nearest_neighbors/CMakeLists.txt deleted file mode 100644 index d49b51f9ce..0000000000 --- a/src/toolkits/nearest_neighbors/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -project(Turi) - -make_library(unity_nearest_neighbors OBJECT - SOURCES - nearest_neighbors.cpp - unity_nearest_neighbors.cpp - brute_force_neighbors.cpp - ball_tree_neighbors.cpp - lsh_family.cpp - lsh_neighbors.cpp - class_registrations.cpp - REQUIRES - eigen - unity_core - unity_ml_model - unity_ml_data_2 -) diff --git a/src/toolkits/nearest_neighbors/ball_tree_neighbors.cpp b/src/toolkits/nearest_neighbors/ball_tree_neighbors.cpp index cf34a0b8e1..2e2405bb0d 100644 --- a/src/toolkits/nearest_neighbors/ball_tree_neighbors.cpp +++ b/src/toolkits/nearest_neighbors/ball_tree_neighbors.cpp @@ -4,10 +4,11 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data -#include -#include -#include -#include +#include +#include +#include +#include +#include // Toolkits #include @@ -20,7 +21,7 @@ #include // Miscellaneous -#include +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/ball_tree_neighbors.hpp b/src/toolkits/nearest_neighbors/ball_tree_neighbors.hpp index cec4282f49..447cc93c2f 100644 --- a/src/toolkits/nearest_neighbors/ball_tree_neighbors.hpp +++ b/src/toolkits/nearest_neighbors/ball_tree_neighbors.hpp @@ -7,6 +7,7 @@ #define TURI_BALL_TREE_NEIGHBORS_H_ // Toolkits +#include #include // Miscellaneous diff --git a/src/toolkits/nearest_neighbors/brute_force_neighbors.cpp b/src/toolkits/nearest_neighbors/brute_force_neighbors.cpp index 2e2269065e..8a511f7d66 100644 --- a/src/toolkits/nearest_neighbors/brute_force_neighbors.cpp +++ b/src/toolkits/nearest_neighbors/brute_force_neighbors.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data -#include -#include -#include +#include +#include +#include +#include // Toolkits #include @@ -14,7 +15,7 @@ #include // Miscellaneous -#include +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/brute_force_neighbors.hpp b/src/toolkits/nearest_neighbors/brute_force_neighbors.hpp index cd535416ef..4117ab7fec 100644 --- a/src/toolkits/nearest_neighbors/brute_force_neighbors.hpp +++ b/src/toolkits/nearest_neighbors/brute_force_neighbors.hpp @@ -7,6 +7,7 @@ #define TURI_BRUTE_FORCE_NEIGHBORS_H_ // Types +#include #include // ML-Data Utils diff --git a/src/toolkits/nearest_neighbors/class_registrations.cpp b/src/toolkits/nearest_neighbors/class_registrations.cpp index c6e7c14615..b534ac0a2d 100644 --- a/src/toolkits/nearest_neighbors/class_registrations.cpp +++ b/src/toolkits/nearest_neighbors/class_registrations.cpp @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/class_registrations.hpp b/src/toolkits/nearest_neighbors/class_registrations.hpp index cd3691a862..a46342654c 100644 --- a/src/toolkits/nearest_neighbors/class_registrations.hpp +++ b/src/toolkits/nearest_neighbors/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_NEAREST_NEIGHBORS_CLASS_REGISTRATIONS #define TURI_NEAREST_NEIGHBORS_CLASS_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/nearest_neighbors/distance_functions.hpp b/src/toolkits/nearest_neighbors/distance_functions.hpp index 9b6c6ed781..d2b0a777a1 100644 --- a/src/toolkits/nearest_neighbors/distance_functions.hpp +++ b/src/toolkits/nearest_neighbors/distance_functions.hpp @@ -10,8 +10,9 @@ #include #include #include +#include #include -#include +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/distances.hpp b/src/toolkits/nearest_neighbors/distances.hpp index 7ac46760ab..081c249e40 100644 --- a/src/toolkits/nearest_neighbors/distances.hpp +++ b/src/toolkits/nearest_neighbors/distances.hpp @@ -6,8 +6,9 @@ #ifndef TURI_DISTANCES_H_ #define TURI_DISTANCES_H_ +#include #include -#include +#include #include #include diff --git a/src/toolkits/nearest_neighbors/hash_map_container.hpp b/src/toolkits/nearest_neighbors/hash_map_container.hpp index cf527ff8c6..7951881b9c 100644 --- a/src/toolkits/nearest_neighbors/hash_map_container.hpp +++ b/src/toolkits/nearest_neighbors/hash_map_container.hpp @@ -6,6 +6,7 @@ #ifndef TURI_HASH_MAP_CONTAINER_H_ #define TURI_HASH_MAP_CONTAINER_H_ +#include #include #include diff --git a/src/toolkits/nearest_neighbors/lsh_family.cpp b/src/toolkits/nearest_neighbors/lsh_family.cpp index 0049c47fc7..9ef4d59e6f 100644 --- a/src/toolkits/nearest_neighbors/lsh_family.cpp +++ b/src/toolkits/nearest_neighbors/lsh_family.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include +#include #include #include diff --git a/src/toolkits/nearest_neighbors/lsh_family.hpp b/src/toolkits/nearest_neighbors/lsh_family.hpp index 0886125095..c3b6708373 100644 --- a/src/toolkits/nearest_neighbors/lsh_family.hpp +++ b/src/toolkits/nearest_neighbors/lsh_family.hpp @@ -7,6 +7,7 @@ #define TURI_LSH_FAMILY_H_ #include +#include #include #include diff --git a/src/toolkits/nearest_neighbors/lsh_neighbors.cpp b/src/toolkits/nearest_neighbors/lsh_neighbors.cpp index c997a0bcc6..23c6d19550 100644 --- a/src/toolkits/nearest_neighbors/lsh_neighbors.cpp +++ b/src/toolkits/nearest_neighbors/lsh_neighbors.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // ML Data -#include -#include -#include +#include +#include +#include +#include // Toolkits #include @@ -15,7 +16,7 @@ #include // Miscellaneous -#include +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/lsh_neighbors.hpp b/src/toolkits/nearest_neighbors/lsh_neighbors.hpp index 7704538c57..e79fe67036 100644 --- a/src/toolkits/nearest_neighbors/lsh_neighbors.hpp +++ b/src/toolkits/nearest_neighbors/lsh_neighbors.hpp @@ -8,6 +8,7 @@ // Toolkits +#include #include #include diff --git a/src/toolkits/nearest_neighbors/nearest_neighbors.cpp b/src/toolkits/nearest_neighbors/nearest_neighbors.cpp index b52660d402..687375d0aa 100644 --- a/src/toolkits/nearest_neighbors/nearest_neighbors.cpp +++ b/src/toolkits/nearest_neighbors/nearest_neighbors.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // Toolkits +#include #include #include #include @@ -12,8 +13,8 @@ #include // ML Data -#include -#include +#include +#include namespace turi { namespace nearest_neighbors { diff --git a/src/toolkits/nearest_neighbors/nearest_neighbors.hpp b/src/toolkits/nearest_neighbors/nearest_neighbors.hpp index 748c0ab560..e3bb59d54d 100644 --- a/src/toolkits/nearest_neighbors/nearest_neighbors.hpp +++ b/src/toolkits/nearest_neighbors/nearest_neighbors.hpp @@ -7,23 +7,24 @@ #define TURI_NEAREST_NEIGHBORS_H_ // Types +#include #include #include #include // Data structure utils #include -#include -#include -#include +#include +#include +#include // Interfaces #include #include #include #include -#include -#include +#include +#include #include diff --git a/src/toolkits/nearest_neighbors/unity_nearest_neighbors.cpp b/src/toolkits/nearest_neighbors/unity_nearest_neighbors.cpp index 7c688192f9..5bc96b1777 100644 --- a/src/toolkits/nearest_neighbors/unity_nearest_neighbors.cpp +++ b/src/toolkits/nearest_neighbors/unity_nearest_neighbors.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // Data structures +#include #include #include #include diff --git a/src/toolkits/nearest_neighbors/unity_nearest_neighbors.hpp b/src/toolkits/nearest_neighbors/unity_nearest_neighbors.hpp index f21dd9513d..2220f1a05f 100644 --- a/src/toolkits/nearest_neighbors/unity_nearest_neighbors.hpp +++ b/src/toolkits/nearest_neighbors/unity_nearest_neighbors.hpp @@ -8,6 +8,7 @@ #include +#include #include #include diff --git a/src/toolkits/object_detection/CMakeLists.txt b/src/toolkits/object_detection/CMakeLists.txt deleted file mode 100644 index a95ba1244a..0000000000 --- a/src/toolkits/object_detection/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -project(Turi) - -make_library(unity_object_detection OBJECT - SOURCES - class_registrations.cpp - object_detector.cpp - od_darknet_yolo_model_trainer.cpp - od_data_iterator.cpp - od_evaluation.cpp - od_model_trainer.cpp - od_serialization.cpp - od_yolo.cpp - REQUIRES - image_io - random - table_printer - unity_core - unity_neural_net -) - -subdirs(one_shot_object_detection) diff --git a/src/toolkits/object_detection/class_registrations.cpp b/src/toolkits/object_detection/class_registrations.cpp index b6b0ba4dc5..a976b176e6 100644 --- a/src/toolkits/object_detection/class_registrations.cpp +++ b/src/toolkits/object_detection/class_registrations.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/object_detection/class_registrations.hpp b/src/toolkits/object_detection/class_registrations.hpp index 7f3ba8d7c8..9ff80c7959 100644 --- a/src/toolkits/object_detection/class_registrations.hpp +++ b/src/toolkits/object_detection/class_registrations.hpp @@ -9,6 +9,7 @@ #include +#include #include namespace turi { diff --git a/src/toolkits/object_detection/object_detector.cpp b/src/toolkits/object_detection/object_detector.cpp index 1db398cf95..4ec81742b0 100644 --- a/src/toolkits/object_detection/object_detector.cpp +++ b/src/toolkits/object_detection/object_detector.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -21,14 +22,16 @@ #include #include #include -#include -#include +#include +#include #include +#include +#include #include #include #include -#include -#include +#include +#include #ifdef __APPLE__ diff --git a/src/toolkits/object_detection/object_detector.hpp b/src/toolkits/object_detection/object_detector.hpp index 92eec475f1..bfbdb1c64e 100644 --- a/src/toolkits/object_detection/object_detector.hpp +++ b/src/toolkits/object_detection/object_detector.hpp @@ -12,14 +12,17 @@ #include #include -#include +#include #include +#include +#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/src/toolkits/object_detection/od_data_iterator.cpp b/src/toolkits/object_detection/od_data_iterator.cpp index 21aa1c22cf..77d8b190d9 100644 --- a/src/toolkits/object_detection/od_data_iterator.cpp +++ b/src/toolkits/object_detection/od_data_iterator.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/toolkits/object_detection/od_data_iterator.hpp b/src/toolkits/object_detection/od_data_iterator.hpp index 33bdeab1b7..5950797b88 100644 --- a/src/toolkits/object_detection/od_data_iterator.hpp +++ b/src/toolkits/object_detection/od_data_iterator.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/object_detection/od_evaluation.cpp b/src/toolkits/object_detection/od_evaluation.cpp index 27401ae8be..5e7af0ac87 100644 --- a/src/toolkits/object_detection/od_evaluation.cpp +++ b/src/toolkits/object_detection/od_evaluation.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/object_detection/od_evaluation.hpp b/src/toolkits/object_detection/od_evaluation.hpp index c5219485ce..6a6ba90dc4 100644 --- a/src/toolkits/object_detection/od_evaluation.hpp +++ b/src/toolkits/object_detection/od_evaluation.hpp @@ -9,6 +9,7 @@ #include +#include #include #include diff --git a/src/toolkits/object_detection/od_serialization.cpp b/src/toolkits/object_detection/od_serialization.cpp index 6de6c8508b..3c4543697e 100644 --- a/src/toolkits/object_detection/od_serialization.cpp +++ b/src/toolkits/object_detection/od_serialization.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -13,8 +14,8 @@ #include #include -#include -#include +#include +#include namespace turi { namespace object_detection { diff --git a/src/toolkits/object_detection/od_serialization.hpp b/src/toolkits/object_detection/od_serialization.hpp index 8b2586f2fd..9b7978dc6c 100644 --- a/src/toolkits/object_detection/od_serialization.hpp +++ b/src/toolkits/object_detection/od_serialization.hpp @@ -8,6 +8,7 @@ #ifndef TURI_OBJECT_DETECTION_OD_SERIALIZATION_H_ #define TURI_OBJECT_DETECTION_OD_SERIALIZATION_H_ +#include #include #include #include diff --git a/src/toolkits/object_detection/od_yolo.cpp b/src/toolkits/object_detection/od_yolo.cpp index e9af6be278..93c7902f7f 100644 --- a/src/toolkits/object_detection/od_yolo.cpp +++ b/src/toolkits/object_detection/od_yolo.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/object_detection/od_yolo.hpp b/src/toolkits/object_detection/od_yolo.hpp index 3952cacba7..de70712f15 100644 --- a/src/toolkits/object_detection/od_yolo.hpp +++ b/src/toolkits/object_detection/od_yolo.hpp @@ -7,6 +7,7 @@ #ifndef TURI_OBJECT_DETECTION_OD_YOLO_H_ #define TURI_OBJECT_DETECTION_OD_YOLO_H_ +#include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/CMakeLists.txt b/src/toolkits/object_detection/one_shot_object_detection/CMakeLists.txt deleted file mode 100644 index ead05d96f5..0000000000 --- a/src/toolkits/object_detection/one_shot_object_detection/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -project(Turi) - -make_library(unity_one_shot_object_detection OBJECT - SOURCES - class_registrations.cpp - util/parameter_sampler.cpp - util/superposition.cpp - one_shot_object_detector.cpp - REQUIRES - image_io - random - table_printer - unity_core -) diff --git a/src/toolkits/object_detection/one_shot_object_detection/class_registrations.cpp b/src/toolkits/object_detection/one_shot_object_detection/class_registrations.cpp index c8d266bc43..d054c70c86 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/class_registrations.cpp +++ b/src/toolkits/object_detection/one_shot_object_detection/class_registrations.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/class_registrations.hpp b/src/toolkits/object_detection/one_shot_object_detection/class_registrations.hpp index 4d0d6b6a1d..7ed764864c 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/class_registrations.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/class_registrations.hpp @@ -10,6 +10,7 @@ #include +#include #include namespace turi { diff --git a/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.cpp b/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.cpp index 4b3c8da0f9..f8c9599bd7 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.cpp +++ b/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.hpp b/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.hpp index 7eda37b3d9..5b9087553b 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/one_shot_object_detector.hpp @@ -8,10 +8,11 @@ #ifndef TURI_ONE_SHOT_OBJECT_DETECTOR_H_ #define TURI_ONE_SHOT_OBJECT_DETECTOR_H_ +#include #include #include #include -#include +#include #include namespace turi { diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/color_convert.hpp b/src/toolkits/object_detection/one_shot_object_detection/util/color_convert.hpp index eb8fced3b2..b8b3284927 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/color_convert.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/color_convert.hpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace boost { diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/mapping_function.hpp b/src/toolkits/object_detection/one_shot_object_detection/util/mapping_function.hpp index 9c1a2589d2..1614b1093f 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/mapping_function.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/mapping_function.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.cpp b/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.cpp index 9474284803..9c7ddab2f0 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.cpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.hpp b/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.hpp index ecf37ebf20..41b4ca30b6 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/superposition.cpp b/src/toolkits/object_detection/one_shot_object_detection/util/superposition.cpp index 3b3422e597..3cd36f2d0d 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/superposition.cpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/superposition.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/object_detection/one_shot_object_detection/util/superposition.hpp b/src/toolkits/object_detection/one_shot_object_detection/util/superposition.hpp index 69f04172ac..540dcf4827 100644 --- a/src/toolkits/object_detection/one_shot_object_detection/util/superposition.hpp +++ b/src/toolkits/object_detection/one_shot_object_detection/util/superposition.hpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/pattern_mining/CMakeLists.txt b/src/toolkits/pattern_mining/CMakeLists.txt deleted file mode 100644 index 40e5ac4388..0000000000 --- a/src/toolkits/pattern_mining/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -project(Turi) - -make_library(unity_pattern_mining OBJECT - SOURCES - class_registrations.cpp - fp_growth.cpp - fp_tree.cpp - fp_tree_header.cpp - fp_node.cpp - fp_results_tree.cpp - rule_mining.cpp - REQUIRES - unity_core - unity_ml_model - unity_feature_engineering -) diff --git a/src/toolkits/pattern_mining/class_registrations.cpp b/src/toolkits/pattern_mining/class_registrations.cpp index abd02e8013..29db2aabb1 100644 --- a/src/toolkits/pattern_mining/class_registrations.cpp +++ b/src/toolkits/pattern_mining/class_registrations.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/pattern_mining/class_registrations.hpp b/src/toolkits/pattern_mining/class_registrations.hpp index 3728f35bf5..58d78f4167 100644 --- a/src/toolkits/pattern_mining/class_registrations.hpp +++ b/src/toolkits/pattern_mining/class_registrations.hpp @@ -6,6 +6,7 @@ #ifndef PATTERN_MINING_REGISTRATIONS_H_ #define PATTERN_MINING_REGISTRATIONS_H_ +#include #include #include #include diff --git a/src/toolkits/pattern_mining/fp_growth.cpp b/src/toolkits/pattern_mining/fp_growth.cpp index 6e11a7c33f..7aee24b3b5 100644 --- a/src/toolkits/pattern_mining/fp_growth.cpp +++ b/src/toolkits/pattern_mining/fp_growth.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/pattern_mining/fp_growth.hpp b/src/toolkits/pattern_mining/fp_growth.hpp index 129034be62..76932feeda 100644 --- a/src/toolkits/pattern_mining/fp_growth.hpp +++ b/src/toolkits/pattern_mining/fp_growth.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/src/toolkits/pattern_mining/fp_node.cpp b/src/toolkits/pattern_mining/fp_node.cpp index e15734c79a..88019978af 100644 --- a/src/toolkits/pattern_mining/fp_node.cpp +++ b/src/toolkits/pattern_mining/fp_node.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/toolkits/pattern_mining/fp_node.hpp b/src/toolkits/pattern_mining/fp_node.hpp index f7c1902c18..aab2904c9f 100644 --- a/src/toolkits/pattern_mining/fp_node.hpp +++ b/src/toolkits/pattern_mining/fp_node.hpp @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/pattern_mining/fp_results_tree.cpp b/src/toolkits/pattern_mining/fp_results_tree.cpp index dce75babd2..2e01216fa1 100644 --- a/src/toolkits/pattern_mining/fp_results_tree.cpp +++ b/src/toolkits/pattern_mining/fp_results_tree.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/toolkits/pattern_mining/fp_results_tree.hpp b/src/toolkits/pattern_mining/fp_results_tree.hpp index 33c0b2ca21..479d729cb9 100644 --- a/src/toolkits/pattern_mining/fp_results_tree.hpp +++ b/src/toolkits/pattern_mining/fp_results_tree.hpp @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/pattern_mining/fp_tree.cpp b/src/toolkits/pattern_mining/fp_tree.cpp index fd92f101f9..332122b96e 100644 --- a/src/toolkits/pattern_mining/fp_tree.cpp +++ b/src/toolkits/pattern_mining/fp_tree.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/pattern_mining/fp_tree.hpp b/src/toolkits/pattern_mining/fp_tree.hpp index 28989d853a..7462314554 100644 --- a/src/toolkits/pattern_mining/fp_tree.hpp +++ b/src/toolkits/pattern_mining/fp_tree.hpp @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/pattern_mining/fp_tree_header.cpp b/src/toolkits/pattern_mining/fp_tree_header.cpp index ea7af7260e..68c32b4cde 100644 --- a/src/toolkits/pattern_mining/fp_tree_header.cpp +++ b/src/toolkits/pattern_mining/fp_tree_header.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include namespace turi { diff --git a/src/toolkits/pattern_mining/fp_tree_header.hpp b/src/toolkits/pattern_mining/fp_tree_header.hpp index c13dc8b3f5..e887ce68eb 100644 --- a/src/toolkits/pattern_mining/fp_tree_header.hpp +++ b/src/toolkits/pattern_mining/fp_tree_header.hpp @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/pattern_mining/rule_mining.cpp b/src/toolkits/pattern_mining/rule_mining.cpp index 1878d053d4..3d35d9dc6d 100644 --- a/src/toolkits/pattern_mining/rule_mining.cpp +++ b/src/toolkits/pattern_mining/rule_mining.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include #include diff --git a/src/toolkits/pattern_mining/rule_mining.hpp b/src/toolkits/pattern_mining/rule_mining.hpp index d0306f3892..682f20dfe9 100644 --- a/src/toolkits/pattern_mining/rule_mining.hpp +++ b/src/toolkits/pattern_mining/rule_mining.hpp @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/src/toolkits/prototype/CMakeLists.txt b/src/toolkits/prototype/CMakeLists.txt deleted file mode 100644 index 3c04b72476..0000000000 --- a/src/toolkits/prototype/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -project(Turi) - -make_library(unity_prototype OBJECT - SOURCES - sparse_nn.cpp - class_registrations.cpp - REQUIRES - unity_core -) diff --git a/src/toolkits/prototype/class_registrations.cpp b/src/toolkits/prototype/class_registrations.cpp index 668f12eccd..27316fd1d8 100644 --- a/src/toolkits/prototype/class_registrations.cpp +++ b/src/toolkits/prototype/class_registrations.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/toolkits/prototype/class_registrations.hpp b/src/toolkits/prototype/class_registrations.hpp index 94c084bb21..b302b5fd53 100644 --- a/src/toolkits/prototype/class_registrations.hpp +++ b/src/toolkits/prototype/class_registrations.hpp @@ -6,6 +6,7 @@ #ifndef TURI_PROTOTYPE_REGISTRATIONS_H_ #define TURI_PROTOTYPE_REGISTRATIONS_H_ +#include #include namespace turi { diff --git a/src/toolkits/prototype/sparse_nn.cpp b/src/toolkits/prototype/sparse_nn.cpp index b3ca845e09..28e2e5b014 100644 --- a/src/toolkits/prototype/sparse_nn.cpp +++ b/src/toolkits/prototype/sparse_nn.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/toolkits/prototype/sparse_nn.hpp b/src/toolkits/prototype/sparse_nn.hpp index b718ff067b..f9c18ea225 100644 --- a/src/toolkits/prototype/sparse_nn.hpp +++ b/src/toolkits/prototype/sparse_nn.hpp @@ -6,6 +6,7 @@ #ifndef SPARSE_NN_HPP #define SPARSE_NN_HPP +#include #include #include #include diff --git a/src/toolkits/recsys/CMakeLists.txt b/src/toolkits/recsys/CMakeLists.txt deleted file mode 100644 index 54eb3a16f8..0000000000 --- a/src/toolkits/recsys/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -project(Turi) - -make_library(unity_recsys OBJECT - SOURCES - class_registrations.cpp - recsys_model_base.cpp - train_test_split.cpp - user_item_lists.cpp - user_item_graph.cpp - models/popularity.cpp - models/itemcf.cpp - models/factorization_models.cpp - REQUIRES - eigen - unity_sparse_similarity - unity_ml_model - unity_ml_data_2 - unity_util - unity_nearest_neighbors - # unity_evaluation - unity_coreml_model_export - unity_factorization - unity_core - unity_coreml_model_export -) diff --git a/src/toolkits/recsys/class_registrations.cpp b/src/toolkits/recsys/class_registrations.cpp index 7fd777a3e1..11341b5f26 100644 --- a/src/toolkits/recsys/class_registrations.cpp +++ b/src/toolkits/recsys/class_registrations.cpp @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/toolkits/recsys/class_registrations.hpp b/src/toolkits/recsys/class_registrations.hpp index 19c0a66eaa..5df7b214ef 100644 --- a/src/toolkits/recsys/class_registrations.hpp +++ b/src/toolkits/recsys/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_RECSYS_CLASS_REGISTRATIONS #define TURI_RECSYS_CLASS_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/ml_data_2/data_storage/internal_metadata.cpp b/src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.cpp similarity index 97% rename from src/toolkits/ml_data_2/data_storage/internal_metadata.cpp rename to src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.cpp index 4a0860dc98..a207e0afba 100644 --- a/src/toolkits/ml_data_2/data_storage/internal_metadata.cpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include +#include +#include +#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/data_storage/internal_metadata.hpp b/src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.hpp similarity index 97% rename from src/toolkits/ml_data_2/data_storage/internal_metadata.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.hpp index 5d9f5e17b6..feafd39c1d 100644 --- a/src/toolkits/ml_data_2/data_storage/internal_metadata.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/internal_metadata.hpp @@ -6,8 +6,9 @@ #ifndef TURI_ML2_DATA_COLUMN_METADATA_H_ #define TURI_ML2_DATA_COLUMN_METADATA_H_ -#include -#include +#include +#include +#include #include namespace turi { diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_block_manager.cpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.cpp similarity index 96% rename from src/toolkits/ml_data_2/data_storage/ml_data_block_manager.cpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.cpp index 67244e1f2c..4b95214522 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_block_manager.cpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_block_manager.hpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.hpp similarity index 96% rename from src/toolkits/ml_data_2/data_storage/ml_data_block_manager.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.hpp index 18b776aaed..e2dc1b9e37 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_block_manager.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_block_manager.hpp @@ -6,7 +6,8 @@ #ifndef TURI_ML_DATA_BLOCK_MANAGER_H_ #define TURI_ML_DATA_BLOCK_MANAGER_H_ -#include +#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_row_format.cpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.cpp similarity index 99% rename from src/toolkits/ml_data_2/data_storage/ml_data_row_format.cpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.cpp index 31e2f05a58..516a39cbb3 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_row_format.cpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_row_format.hpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.hpp similarity index 98% rename from src/toolkits/ml_data_2/data_storage/ml_data_row_format.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.hpp index ca518447b4..89a23b463b 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_row_format.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_format.hpp @@ -6,10 +6,11 @@ #ifndef TURI_ML2_DATA_ROW_FORMAT_H_ #define TURI_ML2_DATA_ROW_FORMAT_H_ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_row_translation.cpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.cpp similarity index 95% rename from src/toolkits/ml_data_2/data_storage/ml_data_row_translation.cpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.cpp index c642069bd9..3ca8a7aaad 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_row_translation.cpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_row_translation.hpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.hpp similarity index 95% rename from src/toolkits/ml_data_2/data_storage/ml_data_row_translation.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.hpp index 947f8ea73a..bfb3910aca 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_row_translation.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_row_translation.hpp @@ -6,13 +6,14 @@ #ifndef TURI_ML2_DATA_ROW_TRANSATION_H_ #define TURI_ML2_DATA_ROW_TRANSATION_H_ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include diff --git a/src/toolkits/ml_data_2/data_storage/ml_data_side_feature_translation.hpp b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_side_feature_translation.hpp similarity index 87% rename from src/toolkits/ml_data_2/data_storage/ml_data_side_feature_translation.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/ml_data_side_feature_translation.hpp index 36d23169de..89f9cd777a 100644 --- a/src/toolkits/ml_data_2/data_storage/ml_data_side_feature_translation.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/ml_data_side_feature_translation.hpp @@ -6,10 +6,11 @@ #ifndef TURI_ML2_DATA_SIDE_FEATURES_TRANSATION_H_ #define TURI_ML2_DATA_SIDE_FEATURES_TRANSATION_H_ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/data_storage/util.cpp b/src/toolkits/recsys/ml_data_2/data_storage/util.cpp similarity index 95% rename from src/toolkits/ml_data_2/data_storage/util.cpp rename to src/toolkits/recsys/ml_data_2/data_storage/util.cpp index fb18813ec3..1b4fdc94d4 100644 --- a/src/toolkits/ml_data_2/data_storage/util.cpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/util.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/data_storage/util.hpp b/src/toolkits/recsys/ml_data_2/data_storage/util.hpp similarity index 91% rename from src/toolkits/ml_data_2/data_storage/util.hpp rename to src/toolkits/recsys/ml_data_2/data_storage/util.hpp index 2ac4fd94d4..d45715c67b 100644 --- a/src/toolkits/ml_data_2/data_storage/util.hpp +++ b/src/toolkits/recsys/ml_data_2/data_storage/util.hpp @@ -6,7 +6,8 @@ #ifndef TURI_ML2_DATA_STORAGE_UTIL_H_ #define TURI_ML2_DATA_STORAGE_UTIL_H_ -#include +#include +#include #include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/indexing/column_indexer.cpp b/src/toolkits/recsys/ml_data_2/indexing/column_indexer.cpp similarity index 94% rename from src/toolkits/ml_data_2/indexing/column_indexer.cpp rename to src/toolkits/recsys/ml_data_2/indexing/column_indexer.cpp index 9083289b94..0094444845 100644 --- a/src/toolkits/ml_data_2/indexing/column_indexer.cpp +++ b/src/toolkits/recsys/ml_data_2/indexing/column_indexer.cpp @@ -3,9 +3,10 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include -#include +#include #include #include diff --git a/src/toolkits/ml_data_2/indexing/column_indexer.hpp b/src/toolkits/recsys/ml_data_2/indexing/column_indexer.hpp similarity index 98% rename from src/toolkits/ml_data_2/indexing/column_indexer.hpp rename to src/toolkits/recsys/ml_data_2/indexing/column_indexer.hpp index 4a09de9691..98cd842471 100644 --- a/src/toolkits/ml_data_2/indexing/column_indexer.hpp +++ b/src/toolkits/recsys/ml_data_2/indexing/column_indexer.hpp @@ -8,11 +8,12 @@ #include #include +#include #include #include #include #include -#include +#include #include #include diff --git a/src/toolkits/ml_data_2/indexing/column_unique_indexer.cpp b/src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.cpp similarity index 99% rename from src/toolkits/ml_data_2/indexing/column_unique_indexer.cpp rename to src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.cpp index 0c9357ace6..40fa431105 100644 --- a/src/toolkits/ml_data_2/indexing/column_unique_indexer.cpp +++ b/src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/indexing/column_unique_indexer.hpp b/src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.hpp similarity index 98% rename from src/toolkits/ml_data_2/indexing/column_unique_indexer.hpp rename to src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.hpp index e9dddf804c..499b873698 100644 --- a/src/toolkits/ml_data_2/indexing/column_unique_indexer.hpp +++ b/src/toolkits/recsys/ml_data_2/indexing/column_unique_indexer.hpp @@ -6,6 +6,7 @@ #ifndef TURI_ML2_DATA_UNIQUE_COLUMN_INDEXER_H_ #define TURI_ML2_DATA_UNIQUE_COLUMN_INDEXER_H_ +#include #include #include #include @@ -13,7 +14,7 @@ #include #include #include -#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/iterators/composite_row_type.cpp b/src/toolkits/recsys/ml_data_2/iterators/composite_row_type.cpp similarity index 97% rename from src/toolkits/ml_data_2/iterators/composite_row_type.cpp rename to src/toolkits/recsys/ml_data_2/iterators/composite_row_type.cpp index 50903d6675..02a4aba2e9 100644 --- a/src/toolkits/ml_data_2/iterators/composite_row_type.cpp +++ b/src/toolkits/recsys/ml_data_2/iterators/composite_row_type.cpp @@ -4,9 +4,10 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include +#include #include -#include -#include +#include +#include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/iterators/composite_row_type.hpp b/src/toolkits/recsys/ml_data_2/iterators/composite_row_type.hpp similarity index 97% rename from src/toolkits/ml_data_2/iterators/composite_row_type.hpp rename to src/toolkits/recsys/ml_data_2/iterators/composite_row_type.hpp index 77a750c19e..6440e0fb24 100644 --- a/src/toolkits/ml_data_2/iterators/composite_row_type.hpp +++ b/src/toolkits/recsys/ml_data_2/iterators/composite_row_type.hpp @@ -7,8 +7,9 @@ #define TURI_ML_DATA_ROW_TYPES_H_ #include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/iterators/ml_data_block_iterator.cpp b/src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.cpp similarity index 94% rename from src/toolkits/ml_data_2/iterators/ml_data_block_iterator.cpp rename to src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.cpp index ed225b163c..f86bc2ded1 100644 --- a/src/toolkits/ml_data_2/iterators/ml_data_block_iterator.cpp +++ b/src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include using namespace turi::v2::ml_data_internal; diff --git a/src/toolkits/ml_data_2/iterators/ml_data_block_iterator.hpp b/src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.hpp similarity index 97% rename from src/toolkits/ml_data_2/iterators/ml_data_block_iterator.hpp rename to src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.hpp index 77294f7fff..eefa52d8f4 100644 --- a/src/toolkits/ml_data_2/iterators/ml_data_block_iterator.hpp +++ b/src/toolkits/recsys/ml_data_2/iterators/ml_data_block_iterator.hpp @@ -6,7 +6,8 @@ #ifndef TURI_ML2_DATA_BLOCK_ITERATOR_H_ #define TURI_ML2_DATA_BLOCK_ITERATOR_H_ -#include +#include +#include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/iterators/ml_data_iterator.hpp b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator.hpp similarity index 92% rename from src/toolkits/ml_data_2/iterators/ml_data_iterator.hpp rename to src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator.hpp index 6f87a4142a..debf56232a 100644 --- a/src/toolkits/ml_data_2/iterators/ml_data_iterator.hpp +++ b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator.hpp @@ -6,7 +6,8 @@ #ifndef TURI_ML2_DATA_ITERATOR_H_ #define TURI_ML2_DATA_ITERATOR_H_ -#include +#include +#include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/iterators/ml_data_iterator_base.cpp b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.cpp similarity index 97% rename from src/toolkits/ml_data_2/iterators/ml_data_iterator_base.cpp rename to src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.cpp index 215f208ee3..01b0438dc4 100644 --- a/src/toolkits/ml_data_2/iterators/ml_data_iterator_base.cpp +++ b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include using namespace turi::v2::ml_data_internal; diff --git a/src/toolkits/ml_data_2/iterators/ml_data_iterator_base.hpp b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.hpp similarity index 96% rename from src/toolkits/ml_data_2/iterators/ml_data_iterator_base.hpp rename to src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.hpp index 4c0fd62764..2638a01f84 100644 --- a/src/toolkits/ml_data_2/iterators/ml_data_iterator_base.hpp +++ b/src/toolkits/recsys/ml_data_2/iterators/ml_data_iterator_base.hpp @@ -6,13 +6,14 @@ #ifndef TURI_ML2_DATA_ITERATOR_BASE_H_ #define TURI_ML2_DATA_ITERATOR_BASE_H_ +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include // SArray and Flex type diff --git a/src/toolkits/ml_data_2/iterators/row_reference.hpp b/src/toolkits/recsys/ml_data_2/iterators/row_reference.hpp similarity index 96% rename from src/toolkits/ml_data_2/iterators/row_reference.hpp rename to src/toolkits/recsys/ml_data_2/iterators/row_reference.hpp index a194429265..0e99debef2 100644 --- a/src/toolkits/ml_data_2/iterators/row_reference.hpp +++ b/src/toolkits/recsys/ml_data_2/iterators/row_reference.hpp @@ -6,11 +6,12 @@ #ifndef TURI_ML_DATA_ROW_REFERENCE_H_ #define TURI_ML_DATA_ROW_REFERENCE_H_ +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/ml_data_2/metadata.cpp b/src/toolkits/recsys/ml_data_2/metadata.cpp similarity index 99% rename from src/toolkits/ml_data_2/metadata.cpp rename to src/toolkits/recsys/ml_data_2/metadata.cpp index 71af2d4424..56ceabaa4f 100644 --- a/src/toolkits/ml_data_2/metadata.cpp +++ b/src/toolkits/recsys/ml_data_2/metadata.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/metadata.hpp b/src/toolkits/recsys/ml_data_2/metadata.hpp similarity index 98% rename from src/toolkits/ml_data_2/metadata.hpp rename to src/toolkits/recsys/ml_data_2/metadata.hpp index 57b2e59fd5..426eb4dba2 100644 --- a/src/toolkits/ml_data_2/metadata.hpp +++ b/src/toolkits/recsys/ml_data_2/metadata.hpp @@ -6,8 +6,9 @@ #ifndef TURI_ML2_METADATA_H_ #define TURI_ML2_METADATA_H_ -#include -#include +#include +#include +#include #include namespace turi { @@ -475,7 +476,7 @@ class EXPORT ml_metadata { }} // Include the implementations of the above inline functions. -#include +#include //////////////////////////////////////////////////////////////////////////////// // Implement serialization for diff --git a/src/toolkits/ml_data_2/metadata_impl.hpp b/src/toolkits/recsys/ml_data_2/metadata_impl.hpp similarity index 99% rename from src/toolkits/ml_data_2/metadata_impl.hpp rename to src/toolkits/recsys/ml_data_2/metadata_impl.hpp index 2d40dd9c29..a202e224ca 100644 --- a/src/toolkits/ml_data_2/metadata_impl.hpp +++ b/src/toolkits/recsys/ml_data_2/metadata_impl.hpp @@ -6,7 +6,8 @@ #ifndef TURI_ML2_METADATA_IMPL_H_ #define TURI_ML2_METADATA_IMPL_H_ -#include +#include +#include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/ml_data.cpp b/src/toolkits/recsys/ml_data_2/ml_data.cpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data.cpp rename to src/toolkits/recsys/ml_data_2/ml_data.cpp index 6f682fa392..b4040baea6 100644 --- a/src/toolkits/ml_data_2/ml_data.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data.cpp @@ -3,13 +3,14 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace turi::v2::ml_data_internal; diff --git a/src/toolkits/ml_data_2/ml_data.hpp b/src/toolkits/recsys/ml_data_2/ml_data.hpp similarity index 99% rename from src/toolkits/ml_data_2/ml_data.hpp rename to src/toolkits/recsys/ml_data_2/ml_data.hpp index 876c5101eb..4aa3c0e8a8 100644 --- a/src/toolkits/ml_data_2/ml_data.hpp +++ b/src/toolkits/recsys/ml_data_2/ml_data.hpp @@ -8,13 +8,14 @@ #include #include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/ml_data_2/ml_data_column_modes.cpp b/src/toolkits/recsys/ml_data_2/ml_data_column_modes.cpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data_column_modes.cpp rename to src/toolkits/recsys/ml_data_2/ml_data_column_modes.cpp index a6a1d7a171..65b508f025 100644 --- a/src/toolkits/ml_data_2/ml_data_column_modes.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_column_modes.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include diff --git a/src/toolkits/ml_data_2/ml_data_column_modes.hpp b/src/toolkits/recsys/ml_data_2/ml_data_column_modes.hpp similarity index 99% rename from src/toolkits/ml_data_2/ml_data_column_modes.hpp rename to src/toolkits/recsys/ml_data_2/ml_data_column_modes.hpp index d70ed25b2e..0e851abde0 100644 --- a/src/toolkits/ml_data_2/ml_data_column_modes.hpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_column_modes.hpp @@ -8,6 +8,7 @@ #include #include +#include #include namespace turi { diff --git a/src/toolkits/ml_data_2/ml_data_entry.hpp b/src/toolkits/recsys/ml_data_2/ml_data_entry.hpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data_entry.hpp rename to src/toolkits/recsys/ml_data_2/ml_data_entry.hpp index 5242f552ea..3ee43feb14 100644 --- a/src/toolkits/ml_data_2/ml_data_entry.hpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_entry.hpp @@ -7,6 +7,7 @@ #define TURI_ML2_DATA_ENTRY_H_ #include +#include #include namespace turi { namespace v2 { diff --git a/src/toolkits/ml_data_2/ml_data_iterators.hpp b/src/toolkits/recsys/ml_data_2/ml_data_iterators.hpp similarity index 73% rename from src/toolkits/ml_data_2/ml_data_iterators.hpp rename to src/toolkits/recsys/ml_data_2/ml_data_iterators.hpp index 0cb726f3e8..28b6b67fbf 100644 --- a/src/toolkits/ml_data_2/ml_data_iterators.hpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_iterators.hpp @@ -9,8 +9,9 @@ //////////////////////////////////////////////////////////////////////////////// // Include definitions for all the iterators defined earlier. -#include -#include +#include +#include +#include #endif /* _ML_DATA_ITERATORS_H_ */ diff --git a/src/toolkits/ml_data_2/ml_data_missing_values.cpp b/src/toolkits/recsys/ml_data_2/ml_data_missing_values.cpp similarity index 93% rename from src/toolkits/ml_data_2/ml_data_missing_values.cpp rename to src/toolkits/recsys/ml_data_2/ml_data_missing_values.cpp index d71ab4b53d..ac3412e39c 100644 --- a/src/toolkits/ml_data_2/ml_data_missing_values.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_missing_values.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/ml_data_missing_values.hpp b/src/toolkits/recsys/ml_data_2/ml_data_missing_values.hpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data_missing_values.hpp rename to src/toolkits/recsys/ml_data_2/ml_data_missing_values.hpp index 5fc9bf3579..6e8d40174e 100644 --- a/src/toolkits/ml_data_2/ml_data_missing_values.hpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_missing_values.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #ifdef ERROR diff --git a/src/toolkits/ml_data_2/ml_data_options.cpp b/src/toolkits/recsys/ml_data_2/ml_data_options.cpp similarity index 77% rename from src/toolkits/ml_data_2/ml_data_options.cpp rename to src/toolkits/recsys/ml_data_2/ml_data_options.cpp index 46259e595c..4479f9c3af 100644 --- a/src/toolkits/ml_data_2/ml_data_options.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_options.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include namespace turi { diff --git a/src/toolkits/ml_data_2/ml_data_setup.cpp b/src/toolkits/recsys/ml_data_2/ml_data_setup.cpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data_setup.cpp rename to src/toolkits/recsys/ml_data_2/ml_data_setup.cpp index d008b5ee38..9ac608970c 100644 --- a/src/toolkits/ml_data_2/ml_data_setup.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_setup.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/ml_data_sorting.cpp b/src/toolkits/recsys/ml_data_2/ml_data_sorting.cpp similarity index 98% rename from src/toolkits/ml_data_2/ml_data_sorting.cpp rename to src/toolkits/recsys/ml_data_2/ml_data_sorting.cpp index c674af7cc5..db0d9c4c85 100644 --- a/src/toolkits/ml_data_2/ml_data_sorting.cpp +++ b/src/toolkits/recsys/ml_data_2/ml_data_sorting.cpp @@ -3,11 +3,12 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include using namespace turi::v2::ml_data_internal; diff --git a/src/toolkits/ml_data_2/row_slicing_utilities.cpp b/src/toolkits/recsys/ml_data_2/row_slicing_utilities.cpp similarity index 98% rename from src/toolkits/ml_data_2/row_slicing_utilities.cpp rename to src/toolkits/recsys/ml_data_2/row_slicing_utilities.cpp index ed1ff15e8f..6100cee4ca 100644 --- a/src/toolkits/ml_data_2/row_slicing_utilities.cpp +++ b/src/toolkits/recsys/ml_data_2/row_slicing_utilities.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include diff --git a/src/toolkits/ml_data_2/row_slicing_utilities.hpp b/src/toolkits/recsys/ml_data_2/row_slicing_utilities.hpp similarity index 98% rename from src/toolkits/ml_data_2/row_slicing_utilities.hpp rename to src/toolkits/recsys/ml_data_2/row_slicing_utilities.hpp index 1a441de394..318ced9fde 100644 --- a/src/toolkits/ml_data_2/row_slicing_utilities.hpp +++ b/src/toolkits/recsys/ml_data_2/row_slicing_utilities.hpp @@ -7,7 +7,8 @@ #define ML_DATA_ROW_SLICING_UTILITIES_H_ #include -#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/sframe_index_mapping.cpp b/src/toolkits/recsys/ml_data_2/sframe_index_mapping.cpp similarity index 99% rename from src/toolkits/ml_data_2/sframe_index_mapping.cpp rename to src/toolkits/recsys/ml_data_2/sframe_index_mapping.cpp index 0c868334fb..7504e59a3a 100644 --- a/src/toolkits/ml_data_2/sframe_index_mapping.cpp +++ b/src/toolkits/recsys/ml_data_2/sframe_index_mapping.cpp @@ -4,13 +4,14 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ // SFrame and Flex type +#include #include #include #include // Indexer and SFrame Index mapping -#include -#include +#include +#include #include using namespace turi::v2::ml_data_internal; diff --git a/src/toolkits/ml_data_2/sframe_index_mapping.hpp b/src/toolkits/recsys/ml_data_2/sframe_index_mapping.hpp similarity index 98% rename from src/toolkits/ml_data_2/sframe_index_mapping.hpp rename to src/toolkits/recsys/ml_data_2/sframe_index_mapping.hpp index c98729c68b..bb5e48d09b 100644 --- a/src/toolkits/ml_data_2/sframe_index_mapping.hpp +++ b/src/toolkits/recsys/ml_data_2/sframe_index_mapping.hpp @@ -8,9 +8,10 @@ #include #include +#include #include -#include -#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // diff --git a/src/toolkits/ml_data_2/side_features.cpp b/src/toolkits/recsys/ml_data_2/side_features.cpp similarity index 99% rename from src/toolkits/ml_data_2/side_features.cpp rename to src/toolkits/recsys/ml_data_2/side_features.cpp index 5c166ae711..dff7136796 100644 --- a/src/toolkits/ml_data_2/side_features.cpp +++ b/src/toolkits/recsys/ml_data_2/side_features.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/side_features.hpp b/src/toolkits/recsys/ml_data_2/side_features.hpp similarity index 98% rename from src/toolkits/ml_data_2/side_features.hpp rename to src/toolkits/recsys/ml_data_2/side_features.hpp index 99a3fa7817..282252b7e0 100644 --- a/src/toolkits/ml_data_2/side_features.hpp +++ b/src/toolkits/recsys/ml_data_2/side_features.hpp @@ -6,10 +6,11 @@ #ifndef TURI_ML2_DATA_SIDE_FEATURES_H_ #define TURI_ML2_DATA_SIDE_FEATURES_H_ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/standardization-inl.hpp b/src/toolkits/recsys/ml_data_2/standardization-inl.hpp similarity index 99% rename from src/toolkits/ml_data_2/standardization-inl.hpp rename to src/toolkits/recsys/ml_data_2/standardization-inl.hpp index bb0ea9f208..fd331b131e 100644 --- a/src/toolkits/ml_data_2/standardization-inl.hpp +++ b/src/toolkits/recsys/ml_data_2/standardization-inl.hpp @@ -7,6 +7,7 @@ #define TURI_STANDARDIZATION_H_ #include +#include #include // Eigen @@ -17,8 +18,8 @@ #include // ML-Data -#include -#include +#include +#include // TODO: List of todo's for this file //------------------------------------------------------------------------------ diff --git a/src/toolkits/ml_data_2/statistics/basic_column_statistics.cpp b/src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.cpp similarity index 99% rename from src/toolkits/ml_data_2/statistics/basic_column_statistics.cpp rename to src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.cpp index 7cb3a844d1..09ad864188 100644 --- a/src/toolkits/ml_data_2/statistics/basic_column_statistics.cpp +++ b/src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/statistics/basic_column_statistics.hpp b/src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.hpp similarity index 99% rename from src/toolkits/ml_data_2/statistics/basic_column_statistics.hpp rename to src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.hpp index abc0b9ef98..caa06b9add 100644 --- a/src/toolkits/ml_data_2/statistics/basic_column_statistics.hpp +++ b/src/toolkits/recsys/ml_data_2/statistics/basic_column_statistics.hpp @@ -6,10 +6,11 @@ #ifndef TURI_ML2_DATA_BASIC_COLUMN_STATISTICS_H_ #define TURI_ML2_DATA_BASIC_COLUMN_STATISTICS_H_ +#include #include #include #include -#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/statistics/column_statistics.cpp b/src/toolkits/recsys/ml_data_2/statistics/column_statistics.cpp similarity index 95% rename from src/toolkits/ml_data_2/statistics/column_statistics.cpp rename to src/toolkits/recsys/ml_data_2/statistics/column_statistics.cpp index 4a32f46594..7a7e5adea6 100644 --- a/src/toolkits/ml_data_2/statistics/column_statistics.cpp +++ b/src/toolkits/recsys/ml_data_2/statistics/column_statistics.cpp @@ -3,8 +3,9 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include -#include +#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/statistics/column_statistics.hpp b/src/toolkits/recsys/ml_data_2/statistics/column_statistics.hpp similarity index 98% rename from src/toolkits/ml_data_2/statistics/column_statistics.hpp rename to src/toolkits/recsys/ml_data_2/statistics/column_statistics.hpp index 380ec409d2..ef450e2859 100644 --- a/src/toolkits/ml_data_2/statistics/column_statistics.hpp +++ b/src/toolkits/recsys/ml_data_2/statistics/column_statistics.hpp @@ -6,10 +6,11 @@ #ifndef TURI_ML2_COLUMN_STATISTICS_H_ #define TURI_ML2_COLUMN_STATISTICS_H_ +#include #include #include #include -#include +#include #include namespace turi { namespace v2 { namespace ml_data_internal { diff --git a/src/toolkits/ml_data_2/testing_utils.cpp b/src/toolkits/recsys/ml_data_2/testing_utils.cpp similarity index 98% rename from src/toolkits/ml_data_2/testing_utils.cpp rename to src/toolkits/recsys/ml_data_2/testing_utils.cpp index fc06d8135c..bb035b303a 100644 --- a/src/toolkits/ml_data_2/testing_utils.cpp +++ b/src/toolkits/recsys/ml_data_2/testing_utils.cpp @@ -3,7 +3,8 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include +#include #include #include #include diff --git a/src/toolkits/ml_data_2/testing_utils.hpp b/src/toolkits/recsys/ml_data_2/testing_utils.hpp similarity index 96% rename from src/toolkits/ml_data_2/testing_utils.hpp rename to src/toolkits/recsys/ml_data_2/testing_utils.hpp index ca724873d9..dc0eeee885 100644 --- a/src/toolkits/ml_data_2/testing_utils.hpp +++ b/src/toolkits/recsys/ml_data_2/testing_utils.hpp @@ -6,9 +6,10 @@ #ifndef TURI_UNITY_ML_DATA_2_TESTING_UTILS_H_ #define TURI_UNITY_ML_DATA_2_TESTING_UTILS_H_ +#include #include -#include -#include +#include +#include #include #include #include diff --git a/src/toolkits/recsys/models.hpp b/src/toolkits/recsys/models.hpp index 306114665f..e598beed51 100644 --- a/src/toolkits/recsys/models.hpp +++ b/src/toolkits/recsys/models.hpp @@ -10,6 +10,7 @@ * Meta header including all recsys models. */ +#include #include #include #include diff --git a/src/toolkits/recsys/models/factorization_models.cpp b/src/toolkits/recsys/models/factorization_models.cpp index 052fa9cd08..01a05d8a9e 100644 --- a/src/toolkits/recsys/models/factorization_models.cpp +++ b/src/toolkits/recsys/models/factorization_models.cpp @@ -3,14 +3,15 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include +#include #include #include #include #include -#include +#include namespace turi { namespace recsys { diff --git a/src/toolkits/recsys/models/factorization_models.hpp b/src/toolkits/recsys/models/factorization_models.hpp index e43c6c627d..3d47ed9308 100644 --- a/src/toolkits/recsys/models/factorization_models.hpp +++ b/src/toolkits/recsys/models/factorization_models.hpp @@ -6,6 +6,7 @@ #ifndef TURI_RECSYS_FACTORIZATION_MODELS_H_ #define TURI_RECSYS_FACTORIZATION_MODELS_H_ +#include #include #include diff --git a/src/toolkits/recsys/models/item_content_recommender.hpp b/src/toolkits/recsys/models/item_content_recommender.hpp index 104e839420..65326721bc 100644 --- a/src/toolkits/recsys/models/item_content_recommender.hpp +++ b/src/toolkits/recsys/models/item_content_recommender.hpp @@ -8,6 +8,7 @@ #include #include +#include #include namespace turi { diff --git a/src/toolkits/recsys/models/itemcf.cpp b/src/toolkits/recsys/models/itemcf.cpp index eacf7fea1f..d7dfbde0f0 100644 --- a/src/toolkits/recsys/models/itemcf.cpp +++ b/src/toolkits/recsys/models/itemcf.cpp @@ -3,31 +3,32 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include namespace turi { namespace recsys { diff --git a/src/toolkits/recsys/models/itemcf.hpp b/src/toolkits/recsys/models/itemcf.hpp index 58c48358e7..fa707a4e1e 100644 --- a/src/toolkits/recsys/models/itemcf.hpp +++ b/src/toolkits/recsys/models/itemcf.hpp @@ -8,8 +8,9 @@ #include #include +#include #include -#include +#include #include #include diff --git a/src/toolkits/recsys/models/popularity.cpp b/src/toolkits/recsys/models/popularity.cpp index 167064d35e..955bd3f7a5 100644 --- a/src/toolkits/recsys/models/popularity.cpp +++ b/src/toolkits/recsys/models/popularity.cpp @@ -3,15 +3,16 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/recsys/models/popularity.hpp b/src/toolkits/recsys/models/popularity.hpp index 7b1d76f989..079610c720 100644 --- a/src/toolkits/recsys/models/popularity.hpp +++ b/src/toolkits/recsys/models/popularity.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/toolkits/recsys/recsys_model_base.cpp b/src/toolkits/recsys/recsys_model_base.cpp index f83f77abb5..955ce85447 100644 --- a/src/toolkits/recsys/recsys_model_base.cpp +++ b/src/toolkits/recsys/recsys_model_base.cpp @@ -3,28 +3,29 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include -#include +#include // Types #include diff --git a/src/toolkits/recsys/recsys_model_base.hpp b/src/toolkits/recsys/recsys_model_base.hpp index d0094fc9ef..17dd00c750 100644 --- a/src/toolkits/recsys/recsys_model_base.hpp +++ b/src/toolkits/recsys/recsys_model_base.hpp @@ -10,15 +10,16 @@ #include #include +#include #include #include #include #include #include -#include -#include +#include +#include #include -#include +#include // Interfaces diff --git a/src/toolkits/recsys/train_test_split.cpp b/src/toolkits/recsys/train_test_split.cpp index a377f295e5..ee58dfaad1 100644 --- a/src/toolkits/recsys/train_test_split.cpp +++ b/src/toolkits/recsys/train_test_split.cpp @@ -3,10 +3,11 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/toolkits/recsys/train_test_split.hpp b/src/toolkits/recsys/train_test_split.hpp index 4c074d84b5..66e0af7414 100644 --- a/src/toolkits/recsys/train_test_split.hpp +++ b/src/toolkits/recsys/train_test_split.hpp @@ -8,6 +8,7 @@ #include #include +#include #include namespace turi { namespace recsys { diff --git a/src/toolkits/recsys/user_item_graph.cpp b/src/toolkits/recsys/user_item_graph.cpp index f064b4a736..ca429d62b3 100644 --- a/src/toolkits/recsys/user_item_graph.cpp +++ b/src/toolkits/recsys/user_item_graph.cpp @@ -3,12 +3,13 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include -#include -#include +#include +#include #include #include -#include +#include namespace turi { namespace recsys { diff --git a/src/toolkits/recsys/user_item_graph.hpp b/src/toolkits/recsys/user_item_graph.hpp index 77e6602158..3a57ae6b26 100644 --- a/src/toolkits/recsys/user_item_graph.hpp +++ b/src/toolkits/recsys/user_item_graph.hpp @@ -6,7 +6,8 @@ #ifndef TURI_RECSYS_USER_ITEM_GRAPH_H_ #define TURI_RECSYS_USER_ITEM_GRAPH_H_ -#include +#include +#include #include #include #include diff --git a/src/toolkits/recsys/user_item_lists.cpp b/src/toolkits/recsys/user_item_lists.cpp index b66ed02055..b55874c070 100644 --- a/src/toolkits/recsys/user_item_lists.cpp +++ b/src/toolkits/recsys/user_item_lists.cpp @@ -4,10 +4,11 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include -#include -#include +#include +#include #include #include diff --git a/src/toolkits/recsys/user_item_lists.hpp b/src/toolkits/recsys/user_item_lists.hpp index 842a6e5b2b..90a6de25e5 100644 --- a/src/toolkits/recsys/user_item_lists.hpp +++ b/src/toolkits/recsys/user_item_lists.hpp @@ -6,7 +6,8 @@ #ifndef TURI_RECSYS_USER_ITEM_LISTS_H_ #define TURI_RECSYS_USER_ITEM_LISTS_H_ -#include +#include +#include #include #include #include diff --git a/src/toolkits/sgd/CMakeLists.txt b/src/toolkits/sgd/CMakeLists.txt deleted file mode 100644 index ba3b353135..0000000000 --- a/src/toolkits/sgd/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -project(Turi) - -make_library(unity_sgd OBJECT - SOURCES - sgd_solver_base.cpp - REQUIRES - unity_ml_data_2 eigen -) diff --git a/src/toolkits/sparse_similarity/CMakeLists.txt b/src/toolkits/sparse_similarity/CMakeLists.txt deleted file mode 100644 index 8904ed9272..0000000000 --- a/src/toolkits/sparse_similarity/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -project(Turi) - -make_library(unity_sparse_similarity OBJECT - SOURCES - sparse_similarity_lookup.cpp - sliced_itemitem_matrix.cpp - REQUIRES - sframe - unity_core -) diff --git a/src/toolkits/style_transfer/class_registrations.cpp b/src/toolkits/style_transfer/class_registrations.cpp index e90c0d7166..4f1c34400a 100644 --- a/src/toolkits/style_transfer/class_registrations.cpp +++ b/src/toolkits/style_transfer/class_registrations.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -15,4 +16,4 @@ REGISTER_CLASS(style_transfer) END_CLASS_REGISTRATION } // namespace style_transfer -} // namespace turi \ No newline at end of file +} // namespace turi diff --git a/src/toolkits/style_transfer/class_registrations.hpp b/src/toolkits/style_transfer/class_registrations.hpp index 86aebf64d9..08968f679e 100644 --- a/src/toolkits/style_transfer/class_registrations.hpp +++ b/src/toolkits/style_transfer/class_registrations.hpp @@ -7,6 +7,7 @@ #ifndef TURI_STYLE_TRANSFER_REGISTRATION_H_ #define TURI_STYLE_TRANSFER_REGISTRATION_H_ +#include #include namespace turi { diff --git a/src/toolkits/style_transfer/style_transfer.cpp b/src/toolkits/style_transfer/style_transfer.cpp index d23243de9a..6db32b2e66 100644 --- a/src/toolkits/style_transfer/style_transfer.cpp +++ b/src/toolkits/style_transfer/style_transfer.cpp @@ -5,21 +5,22 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include #include #include -#include +#include #include #include #include #include #include +#include #include -#include #ifdef HAS_MPS #import diff --git a/src/toolkits/style_transfer/style_transfer.hpp b/src/toolkits/style_transfer/style_transfer.hpp index 73a75e5f98..0f6e1abb2e 100644 --- a/src/toolkits/style_transfer/style_transfer.hpp +++ b/src/toolkits/style_transfer/style_transfer.hpp @@ -10,6 +10,7 @@ #include +#include #include #include #include @@ -17,9 +18,14 @@ #include #include #include +<<<<<<< HEAD +#include +#include +======= #include #include #include +>>>>>>> master #include namespace turi { diff --git a/src/toolkits/style_transfer/style_transfer_data_iterator.cpp b/src/toolkits/style_transfer/style_transfer_data_iterator.cpp index 5daaec7f2e..f19f1bf1e7 100644 --- a/src/toolkits/style_transfer/style_transfer_data_iterator.cpp +++ b/src/toolkits/style_transfer/style_transfer_data_iterator.cpp @@ -5,6 +5,7 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include @@ -114,4 +115,4 @@ std::vector style_transfer_data_iterator::next_batch(size_t batch_si } } // namespace style_transfer -} // namespace turi \ No newline at end of file +} // namespace turi diff --git a/src/toolkits/style_transfer/style_transfer_data_iterator.hpp b/src/toolkits/style_transfer/style_transfer_data_iterator.hpp index d05a1a0451..63b252888d 100644 --- a/src/toolkits/style_transfer/style_transfer_data_iterator.hpp +++ b/src/toolkits/style_transfer/style_transfer_data_iterator.hpp @@ -10,6 +10,7 @@ #include +#include #include namespace turi { diff --git a/src/toolkits/style_transfer/style_transfer_model_definition.cpp b/src/toolkits/style_transfer/style_transfer_model_definition.cpp index 05740374b5..7af48b1bc2 100644 --- a/src/toolkits/style_transfer/style_transfer_model_definition.cpp +++ b/src/toolkits/style_transfer/style_transfer_model_definition.cpp @@ -5,12 +5,13 @@ * https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include -#include +#include namespace turi { namespace style_transfer { diff --git a/src/toolkits/style_transfer/style_transfer_model_definition.hpp b/src/toolkits/style_transfer/style_transfer_model_definition.hpp index 267b29b5ba..dcf987cb6b 100644 --- a/src/toolkits/style_transfer/style_transfer_model_definition.hpp +++ b/src/toolkits/style_transfer/style_transfer_model_definition.hpp @@ -11,6 +11,7 @@ #include #include +#include #include namespace turi { @@ -27,4 +28,4 @@ std::unique_ptr init_vgg_16(const std::string& path); } // namespace style_transfer } // namespace turi -#endif \ No newline at end of file +#endif diff --git a/src/toolkits/supervised_learning/CMakeLists.txt b/src/toolkits/supervised_learning/CMakeLists.txt deleted file mode 100644 index f266664184..0000000000 --- a/src/toolkits/supervised_learning/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -project(Turi) - -make_library(supervised_learning OBJECT - SOURCES - supervised_learning.cpp - linear_regression.cpp - linear_regression_opt_interface.cpp - logistic_regression.cpp - logistic_regression_opt_interface.cpp - linear_svm.cpp - linear_svm_opt_interface.cpp - xgboost.cpp - xgboost_iterator.cpp - boosted_trees.cpp - random_forest.cpp - decision_tree.cpp - xgboost_error.cpp - automatic_model_creation.cpp - classifier_evaluations.cpp - class_registrations.cpp - REQUIRES - unity_core - unity_util - unity_ml_model - unity_coreml_model_export - ml_data - optimization - xgboost - eigen -) -target_compile_definitions(supervised_learning PUBLIC "-DXGBOOST_CUSTOMIZE_MSG_") diff --git a/src/toolkits/text/CMakeLists.txt b/src/toolkits/text/CMakeLists.txt deleted file mode 100644 index c5b857a897..0000000000 --- a/src/toolkits/text/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -project(Turi) - -make_library(unity_text OBJECT - SOURCES - unity_text.cpp - topic_model.cpp - cgs.cpp - alias.cpp - perplexity.cpp - class_registrations.cpp - REQUIRES - unity_core - unity_ml_model - random - logger - unity_ml_data_2 - unity_util -) diff --git a/src/toolkits/text/alias.cpp b/src/toolkits/text/alias.cpp index aca951360d..bcf5b15162 100644 --- a/src/toolkits/text/alias.cpp +++ b/src/toolkits/text/alias.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -13,16 +14,16 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include diff --git a/src/toolkits/text/alias.hpp b/src/toolkits/text/alias.hpp index fb645147f5..edd30893a1 100644 --- a/src/toolkits/text/alias.hpp +++ b/src/toolkits/text/alias.hpp @@ -7,8 +7,9 @@ #define TURI_TEXT_ALIAS_H_ #include +#include #include -#include +#include #include #include #include diff --git a/src/toolkits/text/cgs.cpp b/src/toolkits/text/cgs.cpp index 19e1694ac5..b700b215d7 100644 --- a/src/toolkits/text/cgs.cpp +++ b/src/toolkits/text/cgs.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -13,15 +14,15 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include #include diff --git a/src/toolkits/text/cgs.hpp b/src/toolkits/text/cgs.hpp index eed48d7ef2..425d571e6e 100644 --- a/src/toolkits/text/cgs.hpp +++ b/src/toolkits/text/cgs.hpp @@ -7,9 +7,10 @@ #define TURI_TEXT_CGS_H_ #include +#include #include #include -#include +#include namespace turi { diff --git a/src/toolkits/text/class_registrations.cpp b/src/toolkits/text/class_registrations.cpp index 50dc221f71..237fd150fa 100644 --- a/src/toolkits/text/class_registrations.cpp +++ b/src/toolkits/text/class_registrations.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/toolkits/text/class_registrations.hpp b/src/toolkits/text/class_registrations.hpp index 4c114ba2e1..c1d266e015 100644 --- a/src/toolkits/text/class_registrations.hpp +++ b/src/toolkits/text/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_TEXT_CLASS_REGISTRATIONS #define TURI_TEXT_CLASS_REGISTRATIONS +#include #include #include diff --git a/src/toolkits/text/perplexity.cpp b/src/toolkits/text/perplexity.cpp index da562a76df..84ac3a5b43 100644 --- a/src/toolkits/text/perplexity.cpp +++ b/src/toolkits/text/perplexity.cpp @@ -6,13 +6,14 @@ #include #include #include +#include #include #include #include #include #include #include -#include +#include #include namespace turi { diff --git a/src/toolkits/text/perplexity.hpp b/src/toolkits/text/perplexity.hpp index 409b317ae5..efc5312758 100644 --- a/src/toolkits/text/perplexity.hpp +++ b/src/toolkits/text/perplexity.hpp @@ -6,6 +6,7 @@ #ifndef TURI_TEXT_PERPLEXITY_H_ #define TURI_TEXT_PERPLEXITY_H_ +#include #include namespace turi { diff --git a/src/toolkits/text/scvb.hpp b/src/toolkits/text/scvb.hpp index b7cfac78b2..8086d52317 100644 --- a/src/toolkits/text/scvb.hpp +++ b/src/toolkits/text/scvb.hpp @@ -7,6 +7,7 @@ #define TURI_TEXT_SCVB_H_ // SFrame +#include #include #include diff --git a/src/toolkits/text/topic_model.cpp b/src/toolkits/text/topic_model.cpp index 9aff978dc2..b931328acb 100644 --- a/src/toolkits/text/topic_model.cpp +++ b/src/toolkits/text/topic_model.cpp @@ -6,20 +6,21 @@ #include #include #include +#include #include #include #include -#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/toolkits/text/topic_model.hpp b/src/toolkits/text/topic_model.hpp index 9e5c33183b..9d6e976a49 100644 --- a/src/toolkits/text/topic_model.hpp +++ b/src/toolkits/text/topic_model.hpp @@ -7,6 +7,7 @@ #define TURI_TEXT_TOPICMODEL_H_ // SFrame +#include #include #include @@ -18,8 +19,8 @@ #include #include #include -#include -#include +#include +#include // Interfaces #include diff --git a/src/toolkits/text/unity_text.cpp b/src/toolkits/text/unity_text.cpp index 8cff9f6f94..d1da904495 100644 --- a/src/toolkits/text/unity_text.cpp +++ b/src/toolkits/text/unity_text.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include @@ -22,7 +23,7 @@ #include #include #include -#include +#include #include namespace turi { namespace text { diff --git a/src/toolkits/text/unity_text.hpp b/src/toolkits/text/unity_text.hpp index 4b02ba3364..0b89ac7415 100644 --- a/src/toolkits/text/unity_text.hpp +++ b/src/toolkits/text/unity_text.hpp @@ -6,6 +6,7 @@ #ifndef TURI_UNITY_TEXT_H #define TURI_UNITY_TEXT_H +#include #include #include diff --git a/src/visualization/annotation/CMakeLists.txt b/src/visualization/annotation/CMakeLists.txt index c4bc507e25..9c5f858a17 100644 --- a/src/visualization/annotation/CMakeLists.txt +++ b/src/visualization/annotation/CMakeLists.txt @@ -52,14 +52,12 @@ set(TC_ANNOTATIONS_SOURCE_FILES utils.cpp ) -make_library(annotation OBJECT +make_library(annotation SOURCES ${TC_ANNOTATIONS_SOURCE_FILES} ${TC_ANNOTATIONS_PROTO_FILES} REQUIRES protobuf - process visualization - image_deep_feature_extractor EXTERNAL_VISIBILITY ) diff --git a/src/visualization/annotation/annotation_base.cpp b/src/visualization/annotation/annotation_base.cpp index e219b1773b..90c5b362a4 100644 --- a/src/visualization/annotation/annotation_base.cpp +++ b/src/visualization/annotation/annotation_base.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/visualization/annotation/annotation_base.hpp b/src/visualization/annotation/annotation_base.hpp index 05e1b4ee5e..4f003a803e 100644 --- a/src/visualization/annotation/annotation_base.hpp +++ b/src/visualization/annotation/annotation_base.hpp @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/src/visualization/annotation/build/format/cpp/annotate.pb.h b/src/visualization/annotation/build/format/cpp/annotate.pb.h index 08f1ed9c20..c941c50447 100644 --- a/src/visualization/annotation/build/format/cpp/annotate.pb.h +++ b/src/visualization/annotation/build/format/cpp/annotate.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/build/format/cpp/data.pb.h b/src/visualization/annotation/build/format/cpp/data.pb.h index bff0f6c3fd..e4529cb23a 100644 --- a/src/visualization/annotation/build/format/cpp/data.pb.h +++ b/src/visualization/annotation/build/format/cpp/data.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/build/format/cpp/message.pb.h b/src/visualization/annotation/build/format/cpp/message.pb.h index 1796ef1dae..82c3871366 100644 --- a/src/visualization/annotation/build/format/cpp/message.pb.h +++ b/src/visualization/annotation/build/format/cpp/message.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/build/format/cpp/meta.pb.h b/src/visualization/annotation/build/format/cpp/meta.pb.h index dea75f0746..f6e6e7aa12 100644 --- a/src/visualization/annotation/build/format/cpp/meta.pb.h +++ b/src/visualization/annotation/build/format/cpp/meta.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/build/format/cpp/progress.pb.h b/src/visualization/annotation/build/format/cpp/progress.pb.h index 83db628a81..d4db5931cc 100644 --- a/src/visualization/annotation/build/format/cpp/progress.pb.h +++ b/src/visualization/annotation/build/format/cpp/progress.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/build/format/cpp/similarity.pb.h b/src/visualization/annotation/build/format/cpp/similarity.pb.h index 70bb2f5aea..2e7a6c94ca 100644 --- a/src/visualization/annotation/build/format/cpp/similarity.pb.h +++ b/src/visualization/annotation/build/format/cpp/similarity.pb.h @@ -6,6 +6,7 @@ #include +#include #include #if GOOGLE_PROTOBUF_VERSION < 3003000 diff --git a/src/visualization/annotation/class_registrations.cpp b/src/visualization/annotation/class_registrations.cpp index dbf1328098..79c047db11 100644 --- a/src/visualization/annotation/class_registrations.cpp +++ b/src/visualization/annotation/class_registrations.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/visualization/annotation/class_registrations.hpp b/src/visualization/annotation/class_registrations.hpp index da98f3d7f4..409cb4e32e 100644 --- a/src/visualization/annotation/class_registrations.hpp +++ b/src/visualization/annotation/class_registrations.hpp @@ -1,6 +1,7 @@ #ifndef TURI_ANNOTATIONS_CLASS_REGISTRATIONS_HPP #define TURI_ANNOTATIONS_CLASS_REGISTRATIONS_HPP +#include #include #include diff --git a/src/visualization/annotation/image_classification.cpp b/src/visualization/annotation/image_classification.cpp index 963ba3a9d7..7ef8f72188 100644 --- a/src/visualization/annotation/image_classification.cpp +++ b/src/visualization/annotation/image_classification.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/visualization/annotation/image_classification.hpp b/src/visualization/annotation/image_classification.hpp index f29030e367..605eb67e9e 100644 --- a/src/visualization/annotation/image_classification.hpp +++ b/src/visualization/annotation/image_classification.hpp @@ -1,6 +1,7 @@ #ifndef TURI_ANNOTATIONS_IMAGE_CLASSIFICATION_HPP #define TURI_ANNOTATIONS_IMAGE_CLASSIFICATION_HPP +#include #include #include diff --git a/src/visualization/annotation/object_detection.cpp b/src/visualization/annotation/object_detection.cpp index c455c30db7..663ba3e503 100644 --- a/src/visualization/annotation/object_detection.cpp +++ b/src/visualization/annotation/object_detection.cpp @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/src/visualization/annotation/object_detection.hpp b/src/visualization/annotation/object_detection.hpp index df45e3c656..2622a348de 100644 --- a/src/visualization/annotation/object_detection.hpp +++ b/src/visualization/annotation/object_detection.hpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -60,4 +61,4 @@ create_object_detection_annotation(const std::shared_ptr &data, } // namespace annotate } // namespace turi -#endif \ No newline at end of file +#endif diff --git a/src/visualization/annotation/utils.cpp b/src/visualization/annotation/utils.cpp index dfda7ed444..15164de681 100644 --- a/src/visualization/annotation/utils.cpp +++ b/src/visualization/annotation/utils.cpp @@ -1,3 +1,4 @@ +#include #include "utils.hpp" #include diff --git a/src/visualization/annotation/utils.hpp b/src/visualization/annotation/utils.hpp index 08018b1a7b..3c307f603a 100644 --- a/src/visualization/annotation/utils.hpp +++ b/src/visualization/annotation/utils.hpp @@ -1,6 +1,7 @@ #ifndef TURI_ANNOTATIONS_UTILS_HPP #define TURI_ANNOTATIONS_UTILS_HPP +#include #include "build/format/cpp/annotate.pb.h" #include "build/format/cpp/data.pb.h" #include "build/format/cpp/message.pb.h" diff --git a/src/visualization/client/src/V8Handler.h b/src/visualization/client/src/V8Handler.h index 633caeabaa..31fde3e048 100644 --- a/src/visualization/client/src/V8Handler.h +++ b/src/visualization/client/src/V8Handler.h @@ -2,6 +2,7 @@ #define V8HANDLER_H_ #include +#include class V8Handler : public CefV8Handler { public: diff --git a/src/visualization/client/src/handler.cpp b/src/visualization/client/src/handler.cpp index 2448876ea3..121fbc25fc 100644 --- a/src/visualization/client/src/handler.cpp +++ b/src/visualization/client/src/handler.cpp @@ -1,3 +1,4 @@ +#include #include "handler.h" #include diff --git a/src/visualization/client/src/handler.h b/src/visualization/client/src/handler.h index e319211714..91c46dba72 100644 --- a/src/visualization/client/src/handler.h +++ b/src/visualization/client/src/handler.h @@ -3,6 +3,7 @@ #include +#include #include "include/cef_client.h" class Handler : public CefClient, public CefDisplayHandler, public CefLifeSpanHandler, public CefLoadHandler { diff --git a/src/visualization/client/src/handler_linux.cpp b/src/visualization/client/src/handler_linux.cpp index b236844b89..09a102d943 100644 --- a/src/visualization/client/src/handler_linux.cpp +++ b/src/visualization/client/src/handler_linux.cpp @@ -1,3 +1,4 @@ +#include #include "handler.h" #include diff --git a/src/visualization/client/src/javascript_caller.cpp b/src/visualization/client/src/javascript_caller.cpp index 4f83da2a63..c0a6b33871 100644 --- a/src/visualization/client/src/javascript_caller.cpp +++ b/src/visualization/client/src/javascript_caller.cpp @@ -1,3 +1,4 @@ +#include #include "javascript_caller.h" #include diff --git a/src/visualization/client/src/javascript_caller.h b/src/visualization/client/src/javascript_caller.h index 5008c9d4d3..1f28a1ca5f 100644 --- a/src/visualization/client/src/javascript_caller.h +++ b/src/visualization/client/src/javascript_caller.h @@ -3,6 +3,7 @@ #include +#include #include "include/cef_app.h" #include "include/cef_render_process_handler.h" #include "include/cef_base.h" diff --git a/src/visualization/client/src/layer.cpp b/src/visualization/client/src/layer.cpp index 3a9e38af73..d3e1f38b7c 100644 --- a/src/visualization/client/src/layer.cpp +++ b/src/visualization/client/src/layer.cpp @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/src/visualization/client/src/layer.h b/src/visualization/client/src/layer.h index 71328fc6a5..50e78213a7 100644 --- a/src/visualization/client/src/layer.h +++ b/src/visualization/client/src/layer.h @@ -1,6 +1,7 @@ #ifndef LAYER_H_ #define LAYER_H_ +#include #include "javascript_caller.h" #include diff --git a/src/visualization/client/src/main.cpp b/src/visualization/client/src/main.cpp index 8fc5e2ff97..31f46fb619 100644 --- a/src/visualization/client/src/main.cpp +++ b/src/visualization/client/src/main.cpp @@ -1,3 +1,4 @@ +#include #include "layer.h" #include "pipe.h" diff --git a/src/visualization/client/src/pipe.cpp b/src/visualization/client/src/pipe.cpp index 8d6e355928..755ccfc053 100644 --- a/src/visualization/client/src/pipe.cpp +++ b/src/visualization/client/src/pipe.cpp @@ -1,3 +1,4 @@ +#include #include "pipe.h" #include diff --git a/src/visualization/client/src/pipe.h b/src/visualization/client/src/pipe.h index d7ce58033d..6069d36d77 100644 --- a/src/visualization/client/src/pipe.h +++ b/src/visualization/client/src/pipe.h @@ -1,6 +1,7 @@ #ifndef PIPE_H_ #define PIPE_H_ +#include #include "layer.h" #include diff --git a/src/visualization/server/CMakeLists.txt b/src/visualization/server/CMakeLists.txt index 560bf4f207..f64cbadb97 100644 --- a/src/visualization/server/CMakeLists.txt +++ b/src/visualization/server/CMakeLists.txt @@ -8,7 +8,7 @@ if(APPLE AND NOT TC_BUILD_IOS) set(VISUALIZATION_PLATFORM_SOURCES plot_macos.mm) endif() -make_library(visualization OBJECT +make_library(visualization SOURCES batch_size.cpp boxes_and_whiskers.cpp @@ -34,8 +34,6 @@ make_library(visualization OBJECT vega_data.cpp vega_spec.cpp ${VISUALIZATION_PLATFORM_SOURCES} - REQUIRES - process EXTERNAL_VISIBILITY ) diff --git a/src/visualization/server/batch_size.cpp b/src/visualization/server/batch_size.cpp index af308b8490..6c277a1569 100644 --- a/src/visualization/server/batch_size.cpp +++ b/src/visualization/server/batch_size.cpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "batch_size.hpp" namespace turi { diff --git a/src/visualization/server/batch_size.hpp b/src/visualization/server/batch_size.hpp index 44b11f1daa..dfeba1b962 100644 --- a/src/visualization/server/batch_size.hpp +++ b/src/visualization/server/batch_size.hpp @@ -7,6 +7,7 @@ #ifndef TURI_VISUALIZATION_BATCH_SIZE_HPP #define TURI_VISUALIZATION_BATCH_SIZE_HPP +#include #include #include diff --git a/src/visualization/server/boxes_and_whiskers.cpp b/src/visualization/server/boxes_and_whiskers.cpp index 9065008d6d..e2808a4ac4 100644 --- a/src/visualization/server/boxes_and_whiskers.cpp +++ b/src/visualization/server/boxes_and_whiskers.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "boxes_and_whiskers.hpp" #include "batch_size.hpp" diff --git a/src/visualization/server/boxes_and_whiskers.hpp b/src/visualization/server/boxes_and_whiskers.hpp index 3ba5dd2aec..e1c7aaecce 100644 --- a/src/visualization/server/boxes_and_whiskers.hpp +++ b/src/visualization/server/boxes_and_whiskers.hpp @@ -6,6 +6,7 @@ #ifndef __TC_BOXES_AND_WHISKERS #define __TC_BOXES_AND_WHISKERS +#include #include #include #include diff --git a/src/visualization/server/categorical_heatmap.cpp b/src/visualization/server/categorical_heatmap.cpp index 4c3d1b3d38..fdeb57bf3c 100644 --- a/src/visualization/server/categorical_heatmap.cpp +++ b/src/visualization/server/categorical_heatmap.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "categorical_heatmap.hpp" #include "batch_size.hpp" diff --git a/src/visualization/server/categorical_heatmap.hpp b/src/visualization/server/categorical_heatmap.hpp index ff89b6f50c..f167c65876 100644 --- a/src/visualization/server/categorical_heatmap.hpp +++ b/src/visualization/server/categorical_heatmap.hpp @@ -6,6 +6,7 @@ #ifndef __TC_CATEGORICAL_HEATMAP #define __TC_CATEGORICAL_HEATMAP +#include #include #include #include diff --git a/src/visualization/server/columnwise_summary.cpp b/src/visualization/server/columnwise_summary.cpp index e9d6e9d452..55c7f19ccd 100644 --- a/src/visualization/server/columnwise_summary.cpp +++ b/src/visualization/server/columnwise_summary.cpp @@ -1,3 +1,4 @@ +#include #include "batch_size.hpp" #include "columnwise_summary.hpp" #include diff --git a/src/visualization/server/columnwise_summary.hpp b/src/visualization/server/columnwise_summary.hpp index 4cf7ac51c6..613ab6db44 100644 --- a/src/visualization/server/columnwise_summary.hpp +++ b/src/visualization/server/columnwise_summary.hpp @@ -6,6 +6,7 @@ #ifndef __TC_COLUMN_SUMMARY #define __TC_COLUMN_SUMMARY +#include #include #include #include diff --git a/src/visualization/server/dark_mode.cpp b/src/visualization/server/dark_mode.cpp index b98266dd5b..b1c59ce1ba 100644 --- a/src/visualization/server/dark_mode.cpp +++ b/src/visualization/server/dark_mode.cpp @@ -1,3 +1,4 @@ +#include #include #ifdef __APPLE__ diff --git a/src/visualization/server/dark_mode.hpp b/src/visualization/server/dark_mode.hpp index 4614976106..4662206a55 100644 --- a/src/visualization/server/dark_mode.hpp +++ b/src/visualization/server/dark_mode.hpp @@ -8,3 +8,4 @@ namespace turi { } #endif +#include diff --git a/src/visualization/server/escape.cpp b/src/visualization/server/escape.cpp index 75a6a380be..b9d4e22134 100644 --- a/src/visualization/server/escape.cpp +++ b/src/visualization/server/escape.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/visualization/server/escape.hpp b/src/visualization/server/escape.hpp index bd4488b5df..dd141b24ea 100644 --- a/src/visualization/server/escape.hpp +++ b/src/visualization/server/escape.hpp @@ -2,6 +2,7 @@ #ifndef __TC_ESCAPE #define __TC_ESCAPE +#include #include #include #include diff --git a/src/visualization/server/extrema.hpp b/src/visualization/server/extrema.hpp index 9556bc54e5..cfdc9a192e 100644 --- a/src/visualization/server/extrema.hpp +++ b/src/visualization/server/extrema.hpp @@ -7,6 +7,7 @@ #ifndef __TC_VIS_EXTREMA #define __TC_VIS_EXTREMA +#include #include #include diff --git a/src/visualization/server/groupby.cpp b/src/visualization/server/groupby.cpp index 57e24ff7f5..34de4483d2 100644 --- a/src/visualization/server/groupby.cpp +++ b/src/visualization/server/groupby.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "groupby.hpp" namespace turi { diff --git a/src/visualization/server/groupby.hpp b/src/visualization/server/groupby.hpp index 03207656fe..959218b19f 100644 --- a/src/visualization/server/groupby.hpp +++ b/src/visualization/server/groupby.hpp @@ -6,6 +6,7 @@ #ifndef __TC_VIS_GROUPBY #define __TC_VIS_GROUPBY +#include #include #include #include diff --git a/src/visualization/server/heatmap.cpp b/src/visualization/server/heatmap.cpp index b362e63563..66619432e1 100644 --- a/src/visualization/server/heatmap.cpp +++ b/src/visualization/server/heatmap.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "heatmap.hpp" #include "process_wrapper.hpp" diff --git a/src/visualization/server/heatmap.hpp b/src/visualization/server/heatmap.hpp index 0323506502..c17cc1cf25 100644 --- a/src/visualization/server/heatmap.hpp +++ b/src/visualization/server/heatmap.hpp @@ -7,6 +7,7 @@ #ifndef __TC_VIS_HEATMAP #define __TC_VIS_HEATMAP +#include #include #include "extrema.hpp" diff --git a/src/visualization/server/histogram.cpp b/src/visualization/server/histogram.cpp index 92281c3cfa..0458e89745 100644 --- a/src/visualization/server/histogram.cpp +++ b/src/visualization/server/histogram.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "histogram.hpp" #include diff --git a/src/visualization/server/histogram.hpp b/src/visualization/server/histogram.hpp index feea815e6f..556de3f006 100644 --- a/src/visualization/server/histogram.hpp +++ b/src/visualization/server/histogram.hpp @@ -6,6 +6,7 @@ #ifndef __TC_HISTOGRAM #define __TC_HISTOGRAM +#include #include #include #include diff --git a/src/visualization/server/io_buffer.cpp b/src/visualization/server/io_buffer.cpp index 1535002e68..8584df44d3 100644 --- a/src/visualization/server/io_buffer.cpp +++ b/src/visualization/server/io_buffer.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "io_buffer.hpp" using namespace turi::visualization; diff --git a/src/visualization/server/io_buffer.hpp b/src/visualization/server/io_buffer.hpp index a82d511adc..a0f772c5f5 100644 --- a/src/visualization/server/io_buffer.hpp +++ b/src/visualization/server/io_buffer.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace turi { namespace visualization { diff --git a/src/visualization/server/item_frequency.cpp b/src/visualization/server/item_frequency.cpp index 805af3b25a..f4a2a0d014 100644 --- a/src/visualization/server/item_frequency.cpp +++ b/src/visualization/server/item_frequency.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include diff --git a/src/visualization/server/item_frequency.hpp b/src/visualization/server/item_frequency.hpp index 9c30cd3eed..ab9a0e2710 100644 --- a/src/visualization/server/item_frequency.hpp +++ b/src/visualization/server/item_frequency.hpp @@ -6,6 +6,7 @@ #ifndef __TC_ITEM_FREQUENCY #define __TC_ITEM_FREQUENCY +#include #include #include #include diff --git a/src/visualization/server/plot.cpp b/src/visualization/server/plot.cpp index 559d29608e..43e7b07a6e 100644 --- a/src/visualization/server/plot.cpp +++ b/src/visualization/server/plot.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include #include diff --git a/src/visualization/server/plot.hpp b/src/visualization/server/plot.hpp index 25b8266e34..8e0c93f0c7 100644 --- a/src/visualization/server/plot.hpp +++ b/src/visualization/server/plot.hpp @@ -1,6 +1,7 @@ #ifndef __TC_PLOT_HPP_ #define __TC_PLOT_HPP_ +#include #include #include #include diff --git a/src/visualization/server/process_wrapper.cpp b/src/visualization/server/process_wrapper.cpp index e7995e8d17..7428fe64e0 100644 --- a/src/visualization/server/process_wrapper.cpp +++ b/src/visualization/server/process_wrapper.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "process_wrapper.hpp" #include diff --git a/src/visualization/server/process_wrapper.hpp b/src/visualization/server/process_wrapper.hpp index b2523722d5..80269bd0a0 100644 --- a/src/visualization/server/process_wrapper.hpp +++ b/src/visualization/server/process_wrapper.hpp @@ -6,6 +6,7 @@ #ifndef __TC_PROCESS_WRAPPER #define __TC_PROCESS_WRAPPER +#include #include "io_buffer.hpp" #include @@ -13,7 +14,7 @@ #include #include -#include +#include namespace turi { diff --git a/src/visualization/server/registration.cpp b/src/visualization/server/registration.cpp index ad3c5265b5..1468c09bc2 100644 --- a/src/visualization/server/registration.cpp +++ b/src/visualization/server/registration.cpp @@ -1,3 +1,4 @@ +#include #include "plot.hpp" #include "show.hpp" #include "scatter.hpp" diff --git a/src/visualization/server/scatter.cpp b/src/visualization/server/scatter.cpp index 21b3beb467..2b3a63f290 100644 --- a/src/visualization/server/scatter.cpp +++ b/src/visualization/server/scatter.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "scatter.hpp" #include "process_wrapper.hpp" diff --git a/src/visualization/server/scatter.hpp b/src/visualization/server/scatter.hpp index 315819f5ca..b70c4069c9 100644 --- a/src/visualization/server/scatter.hpp +++ b/src/visualization/server/scatter.hpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include "groupby.hpp" diff --git a/src/visualization/server/server.cpp b/src/visualization/server/server.cpp index 595617ebaf..2cc65c624c 100644 --- a/src/visualization/server/server.cpp +++ b/src/visualization/server/server.cpp @@ -7,6 +7,7 @@ // Server impl code adapted from Beast example in // boost/beast/example/http/server/async/http_server_async.cpp +#include #include #include #include diff --git a/src/visualization/server/server.hpp b/src/visualization/server/server.hpp index c0a33607fb..9ced08c4fb 100644 --- a/src/visualization/server/server.hpp +++ b/src/visualization/server/server.hpp @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/visualization/server/show.cpp b/src/visualization/server/show.cpp index 0aeef6e8a9..1492d4b88e 100644 --- a/src/visualization/server/show.cpp +++ b/src/visualization/server/show.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "show.hpp" #include "boxes_and_whiskers.hpp" diff --git a/src/visualization/server/show.hpp b/src/visualization/server/show.hpp index 8b3a2feff2..95064472c4 100644 --- a/src/visualization/server/show.hpp +++ b/src/visualization/server/show.hpp @@ -6,6 +6,7 @@ #ifndef __SHOW_HPP #define __SHOW_HPP +#include #include #include #include diff --git a/src/visualization/server/summary_view.cpp b/src/visualization/server/summary_view.cpp index fc05a6f05f..35afe89673 100644 --- a/src/visualization/server/summary_view.cpp +++ b/src/visualization/server/summary_view.cpp @@ -1,3 +1,4 @@ +#include #include "summary_view.hpp" #include diff --git a/src/visualization/server/summary_view.hpp b/src/visualization/server/summary_view.hpp index fdcee2e3e9..214ab85ee3 100644 --- a/src/visualization/server/summary_view.hpp +++ b/src/visualization/server/summary_view.hpp @@ -1,6 +1,7 @@ #ifndef _TC_SUMMARY_VIEW #define _TC_SUMMARY_VIEW +#include #include #include diff --git a/src/visualization/server/table.cpp b/src/visualization/server/table.cpp index 4b231601fa..bb9c7c311c 100644 --- a/src/visualization/server/table.cpp +++ b/src/visualization/server/table.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include #include @@ -275,4 +276,4 @@ std::string image_png_data(const turi::flex_image& image, size_t resized_height) return std::string(reinterpret_cast(resized_image.get_image_data()), resized_image.m_image_data_size); } -}} // turi::visualization \ No newline at end of file +}} // turi::visualization diff --git a/src/visualization/server/table.hpp b/src/visualization/server/table.hpp index ffe366a15d..383bfd9a53 100644 --- a/src/visualization/server/table.hpp +++ b/src/visualization/server/table.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace turi { diff --git a/src/visualization/server/thread.cpp b/src/visualization/server/thread.cpp index 941f276749..46b1a6bf5b 100644 --- a/src/visualization/server/thread.cpp +++ b/src/visualization/server/thread.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "thread.hpp" #include diff --git a/src/visualization/server/thread.hpp b/src/visualization/server/thread.hpp index 6c7a355786..8f9bdf5457 100644 --- a/src/visualization/server/thread.hpp +++ b/src/visualization/server/thread.hpp @@ -7,6 +7,7 @@ #define __TC_VISUALIZATION_THREAD #include +#include namespace turi { namespace visualization { diff --git a/src/visualization/server/transformation.cpp b/src/visualization/server/transformation.cpp index 0949c91863..fff806e82e 100644 --- a/src/visualization/server/transformation.cpp +++ b/src/visualization/server/transformation.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "transformation.hpp" namespace turi { diff --git a/src/visualization/server/transformation.hpp b/src/visualization/server/transformation.hpp index 0a7116de18..dfaed9aebe 100644 --- a/src/visualization/server/transformation.hpp +++ b/src/visualization/server/transformation.hpp @@ -6,6 +6,7 @@ #ifndef _CANVAS_STREAMING_TRANSFORMATION #define _CANVAS_STREAMING_TRANSFORMATION +#include #include #include diff --git a/src/visualization/server/vega_data.cpp b/src/visualization/server/vega_data.cpp index 6bb59acf53..aaf6b08d24 100644 --- a/src/visualization/server/vega_data.cpp +++ b/src/visualization/server/vega_data.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include "vega_data.hpp" #include "vega_spec.hpp" #include diff --git a/src/visualization/server/vega_data.hpp b/src/visualization/server/vega_data.hpp index 7b7bebd522..79b3bc4b0f 100644 --- a/src/visualization/server/vega_data.hpp +++ b/src/visualization/server/vega_data.hpp @@ -6,6 +6,7 @@ #ifndef __TC_VEGA_DATA #define __TC_VEGA_DATA +#include #include "transformation.hpp" namespace turi { diff --git a/src/visualization/server/vega_spec.cpp b/src/visualization/server/vega_spec.cpp index c3282739d1..54372f4402 100644 --- a/src/visualization/server/vega_spec.cpp +++ b/src/visualization/server/vega_spec.cpp @@ -3,6 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include #include diff --git a/src/visualization/server/vega_spec.hpp b/src/visualization/server/vega_spec.hpp index 93ffec085f..ed72ee2e87 100644 --- a/src/visualization/server/vega_spec.hpp +++ b/src/visualization/server/vega_spec.hpp @@ -6,6 +6,7 @@ #ifndef __TC_VEGA_SPEC #define __TC_VEGA_SPEC +#include #include #include diff --git a/src/visualization/vega_renderer/CMakeLists.txt b/src/visualization/vega_renderer/CMakeLists.txt index bc8739bbe1..d928c5b6af 100644 --- a/src/visualization/vega_renderer/CMakeLists.txt +++ b/src/visualization/vega_renderer/CMakeLists.txt @@ -39,10 +39,14 @@ if(APPLE AND NOT TC_BUILD_IOS) if (CMAKE_BUILD_TYPE STREQUAL "Release") set(JS_FILE_EXT "min.js") endif() - add_custom_command( - OUTPUT + + set(_JS_OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/vega-5.4.0.${JS_FILE_EXT}.h - ${CMAKE_CURRENT_BINARY_DIR}/vega-lite-3.3.0.${JS_FILE_EXT}.h + ${CMAKE_CURRENT_BINARY_DIR}/vega-lite-3.3.0.${JS_FILE_EXT}.h) + + + add_custom_command( + OUTPUT ${_JS_OUTPUT_FILES} COMMENT "Running xxd to generate headers from JavaScript artifacts" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND xxd -i vega-5.4.0.${JS_FILE_EXT} ${CMAKE_CURRENT_BINARY_DIR}/vega-5.4.0.${JS_FILE_EXT}.h @@ -52,29 +56,21 @@ if(APPLE AND NOT TC_BUILD_IOS) ${CMAKE_CURRENT_SOURCE_DIR}/vega-lite-3.3.0.${JS_FILE_EXT} VERBATIM ) - add_custom_target( - preprocessed_javascript - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/vega-5.4.0.${JS_FILE_EXT}.h - ${CMAKE_CURRENT_BINARY_DIR}/vega-lite-3.3.0.${JS_FILE_EXT}.h - ) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + ## ## VegaRenderer ## - make_library( vega_renderer OBJECT + make_library( vega_renderer SOURCES ${VEGA_RENDERER_SOURCES} REQUIRES ${VEGA_RENDERER_DEPENDENCIES} ) - add_dependencies( - vega_renderer - preprocessed_javascript - ) +set_source_files_properties( + ${VEGA_RENDERER_SOURCES} PROPERTIES OBJECT_DEPENDS "${_JS_OUTPUT_FILES}") target_compile_options(vega_renderer PUBLIC "-fobjc-arc") diff --git a/src/visualization/vega_renderer/JSConsole.h b/src/visualization/vega_renderer/JSConsole.h index a29a9c7b15..8245adc5e6 100644 --- a/src/visualization/vega_renderer/JSConsole.h +++ b/src/visualization/vega_renderer/JSConsole.h @@ -9,4 +9,4 @@ + (void)attachToJavaScriptContext:(JSContext *)context; -@end \ No newline at end of file +@end#include diff --git a/src/visualization/vega_renderer/LogProxy.h b/src/visualization/vega_renderer/LogProxy.h index f43a998c98..68946fcd97 100644 --- a/src/visualization/vega_renderer/LogProxy.h +++ b/src/visualization/vega_renderer/LogProxy.h @@ -5,6 +5,7 @@ */ #import +#include #include #import "LogProxyHandler.h" diff --git a/src/visualization/vega_renderer/LogProxyHandler.h b/src/visualization/vega_renderer/LogProxyHandler.h index 27705b87c5..663171a43e 100644 --- a/src/visualization/vega_renderer/LogProxyHandler.h +++ b/src/visualization/vega_renderer/LogProxyHandler.h @@ -22,4 +22,4 @@ JSExportAs(set, @end @interface LogProxyHandler : NSObject -@end \ No newline at end of file +@end#include diff --git a/src/visualization/vega_renderer/TCVegaCGColorMap.h b/src/visualization/vega_renderer/TCVegaCGColorMap.h index c70dc25737..42f7a02b50 100644 --- a/src/visualization/vega_renderer/TCVegaCGColorMap.h +++ b/src/visualization/vega_renderer/TCVegaCGColorMap.h @@ -16,3 +16,4 @@ #endif /* colors_h */ +#include diff --git a/src/visualization/vega_renderer/TCVegaCSSCursorMap.h b/src/visualization/vega_renderer/TCVegaCSSCursorMap.h index 79bfef7edd..3647399ee5 100644 --- a/src/visualization/vega_renderer/TCVegaCSSCursorMap.h +++ b/src/visualization/vega_renderer/TCVegaCSSCursorMap.h @@ -22,3 +22,4 @@ #endif #endif /* VegaCSSCursorMap_h */ +#include diff --git a/src/visualization/vega_renderer/TCVegaHTMLElement.h b/src/visualization/vega_renderer/TCVegaHTMLElement.h index 3604cc047c..f134bfcabb 100644 --- a/src/visualization/vega_renderer/TCVegaHTMLElement.h +++ b/src/visualization/vega_renderer/TCVegaHTMLElement.h @@ -47,3 +47,4 @@ JSExportAs(addEventListener, @interface TCVegaHTMLElement : NSObject -(instancetype)initWithTagName:(NSString *)tagName NS_DESIGNATED_INITIALIZER; @end +#include diff --git a/src/visualization/vega_renderer/TCVegaJSCanvas.h b/src/visualization/vega_renderer/TCVegaJSCanvas.h index e1d3839dcc..151871fcb8 100644 --- a/src/visualization/vega_renderer/TCVegaJSCanvas.h +++ b/src/visualization/vega_renderer/TCVegaJSCanvas.h @@ -202,3 +202,4 @@ JSExportAs(isPointInPath, #endif /* Canvas_h */ +#include diff --git a/src/visualization/vega_renderer/TCVegaJSConsole.h b/src/visualization/vega_renderer/TCVegaJSConsole.h index 326af3250c..7cf1d7a4ca 100644 --- a/src/visualization/vega_renderer/TCVegaJSConsole.h +++ b/src/visualization/vega_renderer/TCVegaJSConsole.h @@ -10,3 +10,4 @@ + (void)attachToJavaScriptContext:(JSContext *)context; @end +#include diff --git a/src/visualization/vega_renderer/TCVegaJSDocument.h b/src/visualization/vega_renderer/TCVegaJSDocument.h index 97063075bf..26509f214e 100644 --- a/src/visualization/vega_renderer/TCVegaJSDocument.h +++ b/src/visualization/vega_renderer/TCVegaJSDocument.h @@ -22,3 +22,4 @@ JSExportAs(createElement, @property (atomic, strong) TCVegaCGCanvas* canvas; @end +#include diff --git a/src/visualization/vega_renderer/TCVegaJSMouseEvent.h b/src/visualization/vega_renderer/TCVegaJSMouseEvent.h index c866718b6e..c9832663de 100644 --- a/src/visualization/vega_renderer/TCVegaJSMouseEvent.h +++ b/src/visualization/vega_renderer/TCVegaJSMouseEvent.h @@ -21,3 +21,4 @@ @interface TCVegaJSMouseEvent : NSObject @end +#include diff --git a/src/visualization/vega_renderer/TCVegaLogProxy.h b/src/visualization/vega_renderer/TCVegaLogProxy.h index c2411e3938..7a38aaf8a9 100644 --- a/src/visualization/vega_renderer/TCVegaLogProxy.h +++ b/src/visualization/vega_renderer/TCVegaLogProxy.h @@ -46,3 +46,4 @@ + (JSValue *)unwrap:(JSValue *)object; @end +#include diff --git a/src/visualization/vega_renderer/TCVegaLogProxyHandling.h b/src/visualization/vega_renderer/TCVegaLogProxyHandling.h index 8f31fa6da1..3796c71263 100644 --- a/src/visualization/vega_renderer/TCVegaLogProxyHandling.h +++ b/src/visualization/vega_renderer/TCVegaLogProxyHandling.h @@ -23,3 +23,4 @@ JSExportAs(set, @interface TCVegaLogProxyHandler : NSObject @end +#include diff --git a/src/visualization/vega_renderer/TCVegaLogger.h b/src/visualization/vega_renderer/TCVegaLogger.h index b637fbb191..7e2fe51130 100644 --- a/src/visualization/vega_renderer/TCVegaLogger.h +++ b/src/visualization/vega_renderer/TCVegaLogger.h @@ -4,6 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ +#include #include @interface TCVegaLogger : NSObject diff --git a/src/visualization/vega_renderer/TCVegaPortabilityTypes.h b/src/visualization/vega_renderer/TCVegaPortabilityTypes.h index cb036425c5..d985d45597 100644 --- a/src/visualization/vega_renderer/TCVegaPortabilityTypes.h +++ b/src/visualization/vega_renderer/TCVegaPortabilityTypes.h @@ -25,3 +25,4 @@ typedef UIView TCVegaRendererNativeView; #endif #endif /* VegaPortabilityTypes_h */ +#include diff --git a/src/visualization/vega_renderer/TCVegaRenderer.h b/src/visualization/vega_renderer/TCVegaRenderer.h index 1bd5cd331c..7529989e09 100644 --- a/src/visualization/vega_renderer/TCVegaRenderer.h +++ b/src/visualization/vega_renderer/TCVegaRenderer.h @@ -32,3 +32,4 @@ +(NSString *)vegaliteJS; @end +#include diff --git a/test/annotation/object_detector_tests.cxx b/test/annotation/object_detector_tests.cxx index 27669ecdf4..d24b4bccb4 100644 --- a/test/annotation/object_detector_tests.cxx +++ b/test/annotation/object_detector_tests.cxx @@ -325,4 +325,4 @@ BOOST_AUTO_TEST_CASE(test_return_annotations_drop_na) { BOOST_AUTO_TEST_CASE(test_annotation_registry) { object_detection_test::test_annotation_registry(); } -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END() diff --git a/test/benchmark/sframe_bench.cpp b/test/benchmark/sframe_bench.cpp index 29626b23fb..a193470f46 100644 --- a/test/benchmark/sframe_bench.cpp +++ b/test/benchmark/sframe_bench.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include using namespace turi; int main(int argc, char** argv) { diff --git a/test/capi/capi_sframe.cxx b/test/capi/capi_sframe.cxx index a02b177f2b..e877aac5c7 100644 --- a/test/capi/capi_sframe.cxx +++ b/test/capi/capi_sframe.cxx @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include "capi_utils.hpp" diff --git a/test/fileio/fstream_bench.cpp b/test/fileio/fstream_bench.cpp index f820a07518..49a0f16ff1 100644 --- a/test/fileio/fstream_bench.cpp +++ b/test/fileio/fstream_bench.cpp @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include #include #include using namespace turi; diff --git a/test/flexible_type/flexible_datatype_bench.cpp b/test/flexible_type/flexible_datatype_bench.cpp index 40bfa14612..9c6712ed2b 100644 --- a/test/flexible_type/flexible_datatype_bench.cpp +++ b/test/flexible_type/flexible_datatype_bench.cpp @@ -4,7 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include -#include +#include using namespace turi; const int PI_ITERATIONS = 100000000; const int BUBBLE_SORT_SIZE = 30000; diff --git a/test/lambda/dummy_worker.cpp b/test/lambda/dummy_worker.cpp index df83ca66f4..110cc2782c 100644 --- a/test/lambda/dummy_worker.cpp +++ b/test/lambda/dummy_worker.cpp @@ -4,7 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include -#include +#include #include "dummy_worker_interface.hpp" #include #include diff --git a/test/ml_data/dml_load_from_ml_data_2.cxx b/test/ml_data/dml_load_from_ml_data_2.cxx index bc888dca16..f257006bf8 100644 --- a/test/ml_data/dml_load_from_ml_data_2.cxx +++ b/test/ml_data/dml_load_from_ml_data_2.cxx @@ -24,7 +24,7 @@ // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/network/get_ip.cpp b/test/network/get_ip.cpp index 8d9fa249ca..157dde8e45 100644 --- a/test/network/get_ip.cpp +++ b/test/network/get_ip.cpp @@ -4,7 +4,7 @@ * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ #include -#include +#include using namespace turi; diff --git a/test/parallel/thread_tools.cxx b/test/parallel/thread_tools.cxx index 9451597334..ad9b368992 100644 --- a/test/parallel/thread_tools.cxx +++ b/test/parallel/thread_tools.cxx @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/process/process_launch_test.cxx b/test/process/process_launch_test.cxx index a71480cc1e..fa5c62a558 100644 --- a/test/process/process_launch_test.cxx +++ b/test/process/process_launch_test.cxx @@ -1,7 +1,7 @@ #define BOOST_TEST_MODULE #include #include -#include +#include #include using namespace turi; diff --git a/test/random/test_alias.cpp b/test/random/test_alias.cpp index 8786c0094a..096eec8173 100644 --- a/test/random/test_alias.cpp +++ b/test/random/test_alias.cpp @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include #include #include #include diff --git a/test/sframe/sarray_file_format_v2_test.cxx b/test/sframe/sarray_file_format_v2_test.cxx index 90438e5d72..2355c97014 100644 --- a/test/sframe/sarray_file_format_v2_test.cxx +++ b/test/sframe/sarray_file_format_v2_test.cxx @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include using namespace turi; diff --git a/test/sframe/shuffle_test.cxx b/test/sframe/shuffle_test.cxx index 7bedbfb385..ffc6cd733d 100644 --- a/test/sframe/shuffle_test.cxx +++ b/test/sframe/shuffle_test.cxx @@ -3,7 +3,7 @@ #include #include #include -#include +#include using namespace turi; diff --git a/test/sgraph/sgraph_bench.cpp b/test/sgraph/sgraph_bench.cpp index 688a8f4cdf..09d2de154f 100644 --- a/test/sgraph/sgraph_bench.cpp +++ b/test/sgraph/sgraph_bench.cpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include using namespace turi; diff --git a/test/shmipc/shm_ping_client_test.cpp b/test/shmipc/shm_ping_client_test.cpp index 73c1fcbaa6..0d64991f69 100644 --- a/test/shmipc/shm_ping_client_test.cpp +++ b/test/shmipc/shm_ping_client_test.cpp @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include #include #include using namespace turi; diff --git a/test/shmipc/shm_ping_server_test.cpp b/test/shmipc/shm_ping_server_test.cpp index c6fcea41b8..f6aef86959 100644 --- a/test/shmipc/shm_ping_server_test.cpp +++ b/test/shmipc/shm_ping_server_test.cpp @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include #include #include using namespace turi; diff --git a/test/shmipc/shmipc_test.cxx b/test/shmipc/shmipc_test.cxx index fee8dc8a2f..e7df2ecc15 100644 --- a/test/shmipc/shmipc_test.cxx +++ b/test/shmipc/shmipc_test.cxx @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include using namespace turi; // 16 byte buffer diff --git a/test/sketches/count_sketches_test.cxx b/test/sketches/count_sketches_test.cxx index b0e52e0159..5cfe757ed8 100644 --- a/test/sketches/count_sketches_test.cxx +++ b/test/sketches/count_sketches_test.cxx @@ -10,7 +10,7 @@ #include #include #include -#include +#include struct countsketch_test { diff --git a/test/timer/timer_test.cxx b/test/timer/timer_test.cxx index 992e53c46d..2e2bffcf03 100644 --- a/test/timer/timer_test.cxx +++ b/test/timer/timer_test.cxx @@ -1,7 +1,7 @@ #define BOOST_TEST_MODULE #include #include -#include +#include #include using namespace turi; diff --git a/test/toolkits/style_transfer/test_style_transfer_data_iterator.cxx b/test/toolkits/style_transfer/test_style_transfer_data_iterator.cxx index e9889e6ec4..921a49525f 100644 --- a/test/toolkits/style_transfer/test_style_transfer_data_iterator.cxx +++ b/test/toolkits/style_transfer/test_style_transfer_data_iterator.cxx @@ -52,4 +52,4 @@ BOOST_AUTO_TEST_CASE(test_initialization) { TS_ASSERT(expected_style_image == style_image); } } -} \ No newline at end of file +} diff --git a/test/toolkits/style_transfer/test_style_transfer_model_definition.cxx b/test/toolkits/style_transfer/test_style_transfer_model_definition.cxx index 3416c87436..97eb940cb6 100644 --- a/test/toolkits/style_transfer/test_style_transfer_model_definition.cxx +++ b/test/toolkits/style_transfer/test_style_transfer_model_definition.cxx @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "utils.hpp" diff --git a/test/toolkits/style_transfer/utils.cpp b/test/toolkits/style_transfer/utils.cpp index 4ad4b03c4a..a1c3add3ec 100644 --- a/test/toolkits/style_transfer/utils.cpp +++ b/test/toolkits/style_transfer/utils.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include using CoreML::Specification::ArrayFeatureType; using CoreML::Specification::FeatureDescription; diff --git a/test/toolkits/supervised_learning/boosted_trees_classifier_tests.cxx b/test/toolkits/supervised_learning/boosted_trees_classifier_tests.cxx index 94a42940d0..431f9ade46 100644 --- a/test/toolkits/supervised_learning/boosted_trees_classifier_tests.cxx +++ b/test/toolkits/supervised_learning/boosted_trees_classifier_tests.cxx @@ -12,8 +12,8 @@ #include // Models -#include -#include +#include +#include #include #include diff --git a/test/toolkits/supervised_learning/classifier_evaluation.cxx b/test/toolkits/supervised_learning/classifier_evaluation.cxx index 71c7853613..010215911d 100644 --- a/test/toolkits/supervised_learning/classifier_evaluation.cxx +++ b/test/toolkits/supervised_learning/classifier_evaluation.cxx @@ -1,7 +1,7 @@ #define BOOST_TEST_MODULE classifier_evaluations #include -#include +#include #include #include #include diff --git a/test/toolkits/supervised_learning/linear_regression_bench.cxx b/test/toolkits/supervised_learning/linear_regression_bench.cxx index 6b4c531624..f13c267e51 100644 --- a/test/toolkits/supervised_learning/linear_regression_bench.cxx +++ b/test/toolkits/supervised_learning/linear_regression_bench.cxx @@ -11,14 +11,14 @@ // ML-Data Utils #include #include -#include +#include // Optimization Interface #include #include // Models -#include +#include #include #include diff --git a/test/toolkits/supervised_learning/linear_regression_tests.cxx b/test/toolkits/supervised_learning/linear_regression_tests.cxx index 7308010c8e..d554ed29ec 100644 --- a/test/toolkits/supervised_learning/linear_regression_tests.cxx +++ b/test/toolkits/supervised_learning/linear_regression_tests.cxx @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include #include using namespace turi; diff --git a/test/toolkits/supervised_learning/linear_svm_tests.cxx b/test/toolkits/supervised_learning/linear_svm_tests.cxx index c21712e443..4e91aa0966 100644 --- a/test/toolkits/supervised_learning/linear_svm_tests.cxx +++ b/test/toolkits/supervised_learning/linear_svm_tests.cxx @@ -11,12 +11,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include using namespace turi; diff --git a/test/toolkits/supervised_learning/logistic_regression_tests.cxx b/test/toolkits/supervised_learning/logistic_regression_tests.cxx index ec7c2a6dbd..7eb4f15ed0 100644 --- a/test/toolkits/supervised_learning/logistic_regression_tests.cxx +++ b/test/toolkits/supervised_learning/logistic_regression_tests.cxx @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/test/toolkits/supervised_learning/random_forest_tests.cxx b/test/toolkits/supervised_learning/random_forest_tests.cxx index 56fcebac69..9df376731a 100644 --- a/test/toolkits/supervised_learning/random_forest_tests.cxx +++ b/test/toolkits/supervised_learning/random_forest_tests.cxx @@ -12,7 +12,7 @@ #include // Models -#include +#include #include #include diff --git a/test/toolkits/supervised_learning/supervised_learning_mock_test_model.cxx b/test/toolkits/supervised_learning/supervised_learning_mock_test_model.cxx index 34a0a9fda6..9dc157a3a4 100644 --- a/test/toolkits/supervised_learning/supervised_learning_mock_test_model.cxx +++ b/test/toolkits/supervised_learning/supervised_learning_mock_test_model.cxx @@ -9,7 +9,7 @@ #include #include -#include +#include #include using namespace turi; diff --git a/test/unity/toolkits/coreml_export/test_neural_nets_model_exporter.cxx b/test/unity/toolkits/coreml_export/test_neural_nets_model_exporter.cxx index 19da6f78fa..00afc7b46a 100644 --- a/test/unity/toolkits/coreml_export/test_neural_nets_model_exporter.cxx +++ b/test/unity/toolkits/coreml_export/test_neural_nets_model_exporter.cxx @@ -6,7 +6,7 @@ #define BOOST_TEST_MODULE test_neural_nets_model_exporter -#include +#include #include #include @@ -14,7 +14,7 @@ #include #include -#include +#include #include namespace turi { diff --git a/test/unity/toolkits/drawing_classifier/dc_data_utils.hpp b/test/unity/toolkits/drawing_classifier/dc_data_utils.hpp index 8a4a51f64c..b252952266 100644 --- a/test/unity/toolkits/drawing_classifier/dc_data_utils.hpp +++ b/test/unity/toolkits/drawing_classifier/dc_data_utils.hpp @@ -184,4 +184,4 @@ class drawing_data_generator { } // namespace drawing_classifier } // namespace turi -#endif //TURI_DRAWING_CLASSIFIER_TESTING_DATA_UTILS_H_ \ No newline at end of file +#endif //TURI_DRAWING_CLASSIFIER_TESTING_DATA_UTILS_H_ diff --git a/test/unity/toolkits/drawing_classifier/test_dc_evaluation.cxx b/test/unity/toolkits/drawing_classifier/test_dc_evaluation.cxx index 042bfe2a0f..48043df725 100644 --- a/test/unity/toolkits/drawing_classifier/test_dc_evaluation.cxx +++ b/test/unity/toolkits/drawing_classifier/test_dc_evaluation.cxx @@ -10,9 +10,9 @@ #include #include #include -#include +#include #include -#include +#include namespace turi { namespace drawing_classifer { @@ -162,4 +162,4 @@ BOOST_AUTO_TEST_CASE(test_dc_evaluation_all_wrong) { } } // namespace drawing_classifer -} // namespace turi \ No newline at end of file +} // namespace turi diff --git a/test/unity/toolkits/drawing_classifier/test_dc_prediction.cxx b/test/unity/toolkits/drawing_classifier/test_dc_prediction.cxx index 923b3049d0..a75f23a111 100644 --- a/test/unity/toolkits/drawing_classifier/test_dc_prediction.cxx +++ b/test/unity/toolkits/drawing_classifier/test_dc_prediction.cxx @@ -645,4 +645,4 @@ BOOST_AUTO_TEST_CASE(test_drawing_classifier_predict_topk_prob_big_k) { } } // namespace drawing_classifier -} // namespace turi \ No newline at end of file +} // namespace turi diff --git a/test/unity/toolkits/drawing_classifier/test_dc_serialization.cxx b/test/unity/toolkits/drawing_classifier/test_dc_serialization.cxx index a1b5562523..e9d922d15d 100644 --- a/test/unity/toolkits/drawing_classifier/test_dc_serialization.cxx +++ b/test/unity/toolkits/drawing_classifier/test_dc_serialization.cxx @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace turi { @@ -330,4 +330,4 @@ BOOST_AUTO_TEST_CASE(test_save_load) { } // anonymous namespace } // namespace drawing_classifer -} // namespace turi \ No newline at end of file +} // namespace turi diff --git a/test/unity/toolkits/ml_data_2/basic_iteration.cxx b/test/unity/toolkits/ml_data_2/basic_iteration.cxx index c465600d46..62473a05b0 100644 --- a/test/unity/toolkits/ml_data_2/basic_iteration.cxx +++ b/test/unity/toolkits/ml_data_2/basic_iteration.cxx @@ -18,16 +18,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include using namespace turi; diff --git a/test/unity/toolkits/ml_data_2/basic_storage.cxx b/test/unity/toolkits/ml_data_2/basic_storage.cxx index 2a0c300be0..5025d477d3 100644 --- a/test/unity/toolkits/ml_data_2/basic_storage.cxx +++ b/test/unity/toolkits/ml_data_2/basic_storage.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/composite_row_tools.cxx b/test/unity/toolkits/ml_data_2/composite_row_tools.cxx index 6b66f783f5..bf2c31c20b 100644 --- a/test/unity/toolkits/ml_data_2/composite_row_tools.cxx +++ b/test/unity/toolkits/ml_data_2/composite_row_tools.cxx @@ -19,13 +19,13 @@ #include // ML-Data Utils -#include -#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/creation_methods.cxx b/test/unity/toolkits/ml_data_2/creation_methods.cxx index 07cf83dff8..46874ac0f6 100644 --- a/test/unity/toolkits/ml_data_2/creation_methods.cxx +++ b/test/unity/toolkits/ml_data_2/creation_methods.cxx @@ -18,19 +18,19 @@ #include // ML-Data Utils -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include // Testing utils common to all of ml_data #include #include // Testing utils common to all of ml_data -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/metadata_api.cxx b/test/unity/toolkits/ml_data_2/metadata_api.cxx index eb5b16e6b4..d5e107d5ab 100644 --- a/test/unity/toolkits/ml_data_2/metadata_api.cxx +++ b/test/unity/toolkits/ml_data_2/metadata_api.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/metadata_column_operations.cxx b/test/unity/toolkits/ml_data_2/metadata_column_operations.cxx index 19f6ec7b84..317033aece 100644 --- a/test/unity/toolkits/ml_data_2/metadata_column_operations.cxx +++ b/test/unity/toolkits/ml_data_2/metadata_column_operations.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/missing_values.cxx b/test/unity/toolkits/ml_data_2/missing_values.cxx index 21f0ec0e3c..8e033e2ba7 100644 --- a/test/unity/toolkits/ml_data_2/missing_values.cxx +++ b/test/unity/toolkits/ml_data_2/missing_values.cxx @@ -18,19 +18,19 @@ #include // ML-Data Utils -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include // Testing utils common to all of ml_data #include #include // Testing utils common to all of ml_data -#include +#include typedef Eigen::Matrix DenseVector; diff --git a/test/unity/toolkits/ml_data_2/numerics.cxx b/test/unity/toolkits/ml_data_2/numerics.cxx index a4c0e039c6..bdbff7d119 100644 --- a/test/unity/toolkits/ml_data_2/numerics.cxx +++ b/test/unity/toolkits/ml_data_2/numerics.cxx @@ -18,19 +18,19 @@ #include // ML-Data Utils -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include // Testing utils common to all of ml_data #include #include // Testing utils common to all of ml_data -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/row_references.cxx b/test/unity/toolkits/ml_data_2/row_references.cxx index 1283ff53d6..a9d7c15c30 100644 --- a/test/unity/toolkits/ml_data_2/row_references.cxx +++ b/test/unity/toolkits/ml_data_2/row_references.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/row_slicing.cxx b/test/unity/toolkits/ml_data_2/row_slicing.cxx index 4218b1d698..00b1f7611f 100644 --- a/test/unity/toolkits/ml_data_2/row_slicing.cxx +++ b/test/unity/toolkits/ml_data_2/row_slicing.cxx @@ -19,13 +19,13 @@ #include // ML-Data Utils -#include -#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/save_load.cxx b/test/unity/toolkits/ml_data_2/save_load.cxx index 7fe85a7615..6472442233 100644 --- a/test/unity/toolkits/ml_data_2/save_load.cxx +++ b/test/unity/toolkits/ml_data_2/save_load.cxx @@ -18,19 +18,19 @@ #include // ML-Data Utils -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include // Testing utils common to all of ml_data #include #include // Testing utils common to all of ml_data -#include +#include using namespace turi; diff --git a/test/unity/toolkits/ml_data_2/schema_errors.cxx b/test/unity/toolkits/ml_data_2/schema_errors.cxx index 89675f07cf..63f5cf7510 100644 --- a/test/unity/toolkits/ml_data_2/schema_errors.cxx +++ b/test/unity/toolkits/ml_data_2/schema_errors.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/side_features.cxx b/test/unity/toolkits/ml_data_2/side_features.cxx index beaf7a9f7b..8ca598687a 100644 --- a/test/unity/toolkits/ml_data_2/side_features.cxx +++ b/test/unity/toolkits/ml_data_2/side_features.cxx @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/sorting_and_blocks.cxx b/test/unity/toolkits/ml_data_2/sorting_and_blocks.cxx index 67ca76b8e7..8fe5f64e74 100644 --- a/test/unity/toolkits/ml_data_2/sorting_and_blocks.cxx +++ b/test/unity/toolkits/ml_data_2/sorting_and_blocks.cxx @@ -18,16 +18,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/ml_data_2/standardization_interface_tests.cxx b/test/unity/toolkits/ml_data_2/standardization_interface_tests.cxx index 63df6f43cf..bb77f1292d 100644 --- a/test/unity/toolkits/ml_data_2/standardization_interface_tests.cxx +++ b/test/unity/toolkits/ml_data_2/standardization_interface_tests.cxx @@ -15,10 +15,10 @@ #include // ML-Data Utils -#include +#include // Testing utils common to all of ml_data -#include +#include typedef Eigen::Matrix DenseVector; typedef Eigen::SparseVector SparseVector; diff --git a/test/unity/toolkits/ml_data_2/time_ml_data.cpp b/test/unity/toolkits/ml_data_2/time_ml_data.cpp index 62d327c924..95d72d61a5 100644 --- a/test/unity/toolkits/ml_data_2/time_ml_data.cpp +++ b/test/unity/toolkits/ml_data_2/time_ml_data.cpp @@ -6,14 +6,14 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include using namespace turi; diff --git a/test/unity/toolkits/ml_data_2/untranslated_columns.cxx b/test/unity/toolkits/ml_data_2/untranslated_columns.cxx index 0d2ccd6e1b..026b0073cc 100644 --- a/test/unity/toolkits/ml_data_2/untranslated_columns.cxx +++ b/test/unity/toolkits/ml_data_2/untranslated_columns.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include #include diff --git a/test/unity/toolkits/nearest_neighbors.cxx b/test/unity/toolkits/nearest_neighbors.cxx index f8f182d0a0..b52aa0d5ce 100644 --- a/test/unity/toolkits/nearest_neighbors.cxx +++ b/test/unity/toolkits/nearest_neighbors.cxx @@ -19,16 +19,16 @@ #include // ML-Data Utils -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // Testing utils common to all of ml_data_iterator #include #include -#include +#include // Nearest neighbors #include diff --git a/test/unity/toolkits/neural_net/test_model_spec.cxx b/test/unity/toolkits/neural_net/test_model_spec.cxx index 8c86366bd8..dec20f23fe 100644 --- a/test/unity/toolkits/neural_net/test_model_spec.cxx +++ b/test/unity/toolkits/neural_net/test_model_spec.cxx @@ -13,7 +13,7 @@ #include #include -#include +#include #include namespace turi { diff --git a/test/unity/toolkits/object_detection/test_od_serialization.cxx b/test/unity/toolkits/object_detection/test_od_serialization.cxx index 44b75025e6..dfe858296b 100644 --- a/test/unity/toolkits/object_detection/test_od_serialization.cxx +++ b/test/unity/toolkits/object_detection/test_od_serialization.cxx @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace turi { diff --git a/test/unity/toolkits/object_detection/test_od_yolo.cxx b/test/unity/toolkits/object_detection/test_od_yolo.cxx index d3a433e603..f8c00b76b5 100644 --- a/test/unity/toolkits/object_detection/test_od_yolo.cxx +++ b/test/unity/toolkits/object_detection/test_od_yolo.cxx @@ -13,7 +13,7 @@ #include #include -#include +#include #include namespace turi { diff --git a/test/unity/toolkits/recsys/algo_utils.cxx b/test/unity/toolkits/recsys/algo_utils.cxx index 0170050a0a..e1dc0b6588 100644 --- a/test/unity/toolkits/recsys/algo_utils.cxx +++ b/test/unity/toolkits/recsys/algo_utils.cxx @@ -31,7 +31,7 @@ #include -#include +#include using namespace turi; diff --git a/test/unity/toolkits/recsys/factorization_machine.cxx b/test/unity/toolkits/recsys/factorization_machine.cxx index 55db400f9f..5ea8a75ea8 100644 --- a/test/unity/toolkits/recsys/factorization_machine.cxx +++ b/test/unity/toolkits/recsys/factorization_machine.cxx @@ -10,9 +10,9 @@ const bool enable_expensive_tests = false; #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/test/unity/toolkits/recsys/factorization_test_helpers.hpp b/test/unity/toolkits/recsys/factorization_test_helpers.hpp index b70725a53a..e5833a0048 100644 --- a/test/unity/toolkits/recsys/factorization_test_helpers.hpp +++ b/test/unity/toolkits/recsys/factorization_test_helpers.hpp @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/test/unity/toolkits/recsys/get_similar_tests.cxx b/test/unity/toolkits/recsys/get_similar_tests.cxx index 0aa9d2d995..edd7bc139a 100644 --- a/test/unity/toolkits/recsys/get_similar_tests.cxx +++ b/test/unity/toolkits/recsys/get_similar_tests.cxx @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/test/unity/toolkits/recsys/itemcf.cxx b/test/unity/toolkits/recsys/itemcf.cxx index cd5843b567..cc9235dc53 100644 --- a/test/unity/toolkits/recsys/itemcf.cxx +++ b/test/unity/toolkits/recsys/itemcf.cxx @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/test/unity/toolkits/recsys/itemcf_stress_test.cpp b/test/unity/toolkits/recsys/itemcf_stress_test.cpp index 9cbccf82ba..be8dfbbf86 100644 --- a/test/unity/toolkits/recsys/itemcf_stress_test.cpp +++ b/test/unity/toolkits/recsys/itemcf_stress_test.cpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace turi; diff --git a/test/unity/toolkits/recsys/matrix_factorization.cxx b/test/unity/toolkits/recsys/matrix_factorization.cxx index 0f7297dd39..7f4679a0fc 100644 --- a/test/unity/toolkits/recsys/matrix_factorization.cxx +++ b/test/unity/toolkits/recsys/matrix_factorization.cxx @@ -15,9 +15,9 @@ const bool enable_expensive_tests = false; #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/test/unity/toolkits/recsys/new_user_tests.cxx b/test/unity/toolkits/recsys/new_user_tests.cxx index e513ceff57..5736d7c96e 100644 --- a/test/unity/toolkits/recsys/new_user_tests.cxx +++ b/test/unity/toolkits/recsys/new_user_tests.cxx @@ -13,10 +13,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/test/unity/toolkits/recsys/popularity.cxx b/test/unity/toolkits/recsys/popularity.cxx index 32fc4c8b66..eec407362b 100644 --- a/test/unity/toolkits/recsys/popularity.cxx +++ b/test/unity/toolkits/recsys/popularity.cxx @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/test/unity/toolkits/recsys/ranking_model_tests.cxx b/test/unity/toolkits/recsys/ranking_model_tests.cxx index dd12478cff..635baad6dd 100644 --- a/test/unity/toolkits/recsys/ranking_model_tests.cxx +++ b/test/unity/toolkits/recsys/ranking_model_tests.cxx @@ -16,10 +16,10 @@ const bool enable_expensive_tests = false; #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/test/unity/toolkits/recsys/recommend_function.cxx b/test/unity/toolkits/recsys/recommend_function.cxx index 65a8309377..d3b75925de 100644 --- a/test/unity/toolkits/recsys/recommend_function.cxx +++ b/test/unity/toolkits/recsys/recommend_function.cxx @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/test/unity/toolkits/recsys/test_memory_consumption.cpp b/test/unity/toolkits/recsys/test_memory_consumption.cpp index 9544119df1..0030ecd111 100644 --- a/test/unity/toolkits/recsys/test_memory_consumption.cpp +++ b/test/unity/toolkits/recsys/test_memory_consumption.cpp @@ -6,12 +6,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include using namespace turi; using namespace turi::recsys; diff --git a/test/unity/toolkits/recsys/train_test_split.cxx b/test/unity/toolkits/recsys/train_test_split.cxx index ecf2877cde..ab5680e925 100644 --- a/test/unity/toolkits/recsys/train_test_split.cxx +++ b/test/unity/toolkits/recsys/train_test_split.cxx @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/test/unity/toolkits/recsys/user_item_lists.cxx b/test/unity/toolkits/recsys/user_item_lists.cxx index 9eb9817b5b..01534d3f49 100644 --- a/test/unity/toolkits/recsys/user_item_lists.cxx +++ b/test/unity/toolkits/recsys/user_item_lists.cxx @@ -22,10 +22,10 @@ #include // ML-Data Utils -#include -#include -#include -#include +#include +#include +#include +#include #include // Testing utils common to all of ml_data_iterator diff --git a/test/unity/toolkits/recsys/weird_segments.cxx b/test/unity/toolkits/recsys/weird_segments.cxx index 34f4c3c87f..bd59491923 100644 --- a/test/unity/toolkits/recsys/weird_segments.cxx +++ b/test/unity/toolkits/recsys/weird_segments.cxx @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/test/unity/toolkits/sparse_similarity/test_brute_force_all_pairs.cxx b/test/unity/toolkits/sparse_similarity/test_brute_force_all_pairs.cxx index 53f095d526..8f7d2fbfde 100644 --- a/test/unity/toolkits/sparse_similarity/test_brute_force_all_pairs.cxx +++ b/test/unity/toolkits/sparse_similarity/test_brute_force_all_pairs.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/test/unity/toolkits/sparse_similarity/test_item_similarity_consistency.cxx b/test/unity/toolkits/sparse_similarity/test_item_similarity_consistency.cxx index 0924c3f6a1..1d5be20a42 100644 --- a/test/unity/toolkits/sparse_similarity/test_item_similarity_consistency.cxx +++ b/test/unity/toolkits/sparse_similarity/test_item_similarity_consistency.cxx @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include #include #include "generate_sparse_data.hpp" diff --git a/test/unity/toolkits/sparse_similarity/test_itemitem_matrix.cxx b/test/unity/toolkits/sparse_similarity/test_itemitem_matrix.cxx index 59e58ea69a..690f59b86c 100644 --- a/test/unity/toolkits/sparse_similarity/test_itemitem_matrix.cxx +++ b/test/unity/toolkits/sparse_similarity/test_itemitem_matrix.cxx @@ -15,7 +15,7 @@ #include -#include +#include #include #include diff --git a/test/unity/toolkits/sparse_similarity/test_matrix_utilities.cxx b/test/unity/toolkits/sparse_similarity/test_matrix_utilities.cxx index 343d83ef13..ac19574577 100644 --- a/test/unity/toolkits/sparse_similarity/test_matrix_utilities.cxx +++ b/test/unity/toolkits/sparse_similarity/test_matrix_utilities.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include using namespace turi; diff --git a/test/unity/toolkits/sparse_similarity/test_transpose.cxx b/test/unity/toolkits/sparse_similarity/test_transpose.cxx index e158a3d580..88060ce2a4 100644 --- a/test/unity/toolkits/sparse_similarity/test_transpose.cxx +++ b/test/unity/toolkits/sparse_similarity/test_transpose.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include using namespace turi; diff --git a/test/unity/toolkits/synthetic_timings/time_data_loading.cpp b/test/unity/toolkits/synthetic_timings/time_data_loading.cpp index d339e0921c..ef9a5a72b7 100644 --- a/test/unity/toolkits/synthetic_timings/time_data_loading.cpp +++ b/test/unity/toolkits/synthetic_timings/time_data_loading.cpp @@ -7,10 +7,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/test/unity/toolkits/synthetic_timings/time_nearest_neighbors.cpp b/test/unity/toolkits/synthetic_timings/time_nearest_neighbors.cpp index 67ee220612..6f07519a09 100644 --- a/test/unity/toolkits/synthetic_timings/time_nearest_neighbors.cpp +++ b/test/unity/toolkits/synthetic_timings/time_nearest_neighbors.cpp @@ -6,17 +6,17 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include using namespace turi; diff --git a/test/unity/toolkits/synthetic_timings/time_recsys_model.hpp b/test/unity/toolkits/synthetic_timings/time_recsys_model.hpp index e98aea57ac..490e62c7ae 100644 --- a/test/unity/toolkits/synthetic_timings/time_recsys_model.hpp +++ b/test/unity/toolkits/synthetic_timings/time_recsys_model.hpp @@ -9,12 +9,12 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include using namespace turi; using namespace turi::recsys; diff --git a/test/unity/toolkits/test_evaluation.cxx b/test/unity/toolkits/test_evaluation.cxx index 52088b5c7b..62f45bed1e 100644 --- a/test/unity/toolkits/test_evaluation.cxx +++ b/test/unity/toolkits/test_evaluation.cxx @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/unity/toolkits/topic_model.cxx b/test/unity/toolkits/topic_model.cxx index 8d704624b2..f6f0b6b90b 100644 --- a/test/unity/toolkits/topic_model.cxx +++ b/test/unity/toolkits/topic_model.cxx @@ -5,7 +5,7 @@ #include -#include +#include #include #include #include diff --git a/test/util/test_crash_handler.cpp b/test/util/test_crash_handler.cpp index eac6c56768..e1eca7c6ce 100644 --- a/test/util/test_crash_handler.cpp +++ b/test/util/test_crash_handler.cpp @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-3-clause license that can * be found in the LICENSE.txt file or at https://opensource.org/licenses/BSD-3-Clause */ -#include +#include #include #include diff --git a/test/util/time_fast_power.cpp b/test/util/time_fast_power.cpp index 75c962faae..85b3703f26 100644 --- a/test/util/time_fast_power.cpp +++ b/test/util/time_fast_power.cpp @@ -5,7 +5,7 @@ */ #include #include -#include +#include #include #include #include