mirror of
https://github.com/marian-nmt/marian.git
synced 2024-09-17 09:47:34 +03:00
Merged PR 13052: Fix FAISS on Windows
* adds the correct definitions for FINTEGER for Linux and Windows * moves things around a bit in the CMakeLists.txt files to keep things more local * fixes a few more warnings in 3rd party code
This commit is contained in:
Martin Junczys-Dowmunt
parent
7fb5747d6d
commit
0dc318e993
@ -67,10 +67,11 @@ if(MSVC)
|
||||
# C4324: 'marian::cpu::int16::`anonymous-namespace'::ScatterPut': structure was padded due to alignment specifier
|
||||
set(DISABLE_GLOBALLY "/wd\"4310\" /wd\"4324\"")
|
||||
|
||||
set(INTRINSICS "/arch:AVX")
|
||||
# set(INTRINSICS "/arch:AVX")
|
||||
add_definitions(-DUSE_SSE2=1)
|
||||
|
||||
# Or maybe use these?
|
||||
# set(INTRINSICS "/arch:AVX2")
|
||||
set(INTRINSICS "/arch:AVX2")
|
||||
# set(INTRINSICS "/arch:AVX512")
|
||||
|
||||
set(CMAKE_CXX_FLAGS "/EHsc /DWIN32 /D_WINDOWS /DUNICODE /D_UNICODE /D_CRT_NONSTDC_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS ${DISABLE_GLOBALLY}")
|
||||
@ -138,9 +139,6 @@ else(MSVC)
|
||||
set(INTRINSICS "-msse4.1")
|
||||
endif()
|
||||
|
||||
add_definitions(-DFINTEGER=long)
|
||||
set(EXT_LIBS ${EXT_LIBS} faiss)
|
||||
|
||||
if(USE_FBGEMM)
|
||||
set(EXT_LIBS ${EXT_LIBS} fbgemm dl)
|
||||
add_definitions(-DUSE_FBGEMM=1)
|
||||
|
||||
2
src/3rd_party/CMakeLists.txt
vendored
2
src/3rd_party/CMakeLists.txt
vendored
@ -100,8 +100,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
" -fPIC -Wno-unused-value")
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
include_directories(./zlib)
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
25
src/3rd_party/cnpy/cnpy.h
vendored
25
src/3rd_party/cnpy/cnpy.h
vendored
@ -5,6 +5,8 @@
|
||||
#ifndef LIBCNPY_H_
|
||||
#define LIBCNPY_H_
|
||||
|
||||
#include "3rd_party/zlib/zlib.h"
|
||||
|
||||
#include<string>
|
||||
#include<stdexcept>
|
||||
#include<sstream>
|
||||
@ -13,7 +15,6 @@
|
||||
#include<typeinfo>
|
||||
#include<iostream>
|
||||
#include<cassert>
|
||||
#include<zlib.h>
|
||||
#include<map>
|
||||
#include <memory>
|
||||
|
||||
@ -260,8 +261,8 @@ namespace cnpy {
|
||||
static inline
|
||||
void npz_save(std::string zipname, const std::vector<NpzItem>& items)
|
||||
{
|
||||
auto tmpname = zipname + "$$"; // TODO: add thread id or something
|
||||
unlink(tmpname.c_str()); // when saving to HDFS, we cannot overwrite an existing file
|
||||
auto tmpname = zipname + "$$"; // TODO: add thread id or something
|
||||
unlink(tmpname.c_str()); // when saving to HDFS, we cannot overwrite an existing file
|
||||
FILE* fp = fopen(tmpname.c_str(),"wb");
|
||||
if (!fp)
|
||||
throw std::runtime_error("npz_save: error opening file for writing: " + tmpname);
|
||||
@ -351,15 +352,15 @@ namespace cnpy {
|
||||
fclose(fp);
|
||||
|
||||
// move to final location (atomically)
|
||||
#ifdef _MSC_VER
|
||||
unlink(zipname.c_str()); // needed for Windows
|
||||
#endif
|
||||
bad = bad || (rename(tmpname.c_str(), zipname.c_str()) == -1);
|
||||
|
||||
if (bad)
|
||||
{
|
||||
unlink(tmpname.c_str());
|
||||
throw std::runtime_error("npz_save: error saving to file: " + zipname);
|
||||
#ifdef _MSC_VER
|
||||
unlink(zipname.c_str()); // needed for Windows
|
||||
#endif
|
||||
bad = bad || (rename(tmpname.c_str(), zipname.c_str()) == -1);
|
||||
|
||||
if (bad)
|
||||
{
|
||||
unlink(tmpname.c_str());
|
||||
throw std::runtime_error("npz_save: error saving to file: " + zipname);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
9
src/3rd_party/faiss/CMakeLists.txt
vendored
9
src/3rd_party/faiss/CMakeLists.txt
vendored
@ -1,10 +1,7 @@
|
||||
# adding a new file require explicittly modifing the CMakeLists.txt
|
||||
|
||||
add_definitions(-DFINTEGER=uint64_t)
|
||||
|
||||
include_directories("impl")
|
||||
|
||||
FILE(GLOB FaissCppSources *.cpp impl/*.cpp utils/*.cpp)
|
||||
|
||||
if (NOT TARGET faiss)
|
||||
add_library(faiss STATIC ${FaissCppSources})
|
||||
endif()
|
||||
|
||||
add_library(faiss OBJECT ${FaissCppSources})
|
||||
|
||||
8
src/3rd_party/faiss/VectorTransform.cpp
vendored
8
src/3rd_party/faiss/VectorTransform.cpp
vendored
@ -24,7 +24,7 @@ extern "C" {
|
||||
|
||||
// this is to keep the clang syntax checker happy
|
||||
#ifndef FINTEGER
|
||||
#define FINTEGER int
|
||||
#define FINTEGER uint64_t // MJD: only really safe type for use between Linux and Windows and different MKL versions. Not tested with non-MKL CBLAS
|
||||
#endif
|
||||
|
||||
|
||||
@ -118,8 +118,8 @@ const float *fvecs_maybe_subsample(
|
||||
|
||||
size_t n2 = nmax;
|
||||
if (verbose) {
|
||||
printf(" Input training set too big (max size is %ld), sampling "
|
||||
"%ld / %ld vectors\n", nmax, n2, *n);
|
||||
printf(" Input training set too big (max size is %zu), sampling "
|
||||
"%zu / %zu vectors\n", nmax, n2, *n);
|
||||
}
|
||||
std::vector<int> subset(*n);
|
||||
rand_perm(subset.data(), *n, seed);
|
||||
@ -392,7 +392,7 @@ void RandomRotationMatrix::init (int seed)
|
||||
is_trained = true;
|
||||
}
|
||||
|
||||
void RandomRotationMatrix::train (Index::idx_t /*n*/, const float */*x*/)
|
||||
void RandomRotationMatrix::train (Index::idx_t /*n*/, const float* /*x*/)
|
||||
{
|
||||
// initialize with some arbitrary seed
|
||||
init (12345);
|
||||
|
||||
44
src/3rd_party/phf/phf.cc
vendored
44
src/3rd_party/phf/phf.cc
vendored
@ -249,8 +249,8 @@ namespace PHF {
|
||||
|
||||
template<>
|
||||
int cmp(const phf_string_t *a, const phf_string_t *b) {
|
||||
int cmp;
|
||||
if ((cmp = memcmp(a->p, b->p, PHF_MIN(a->n, b->n))))
|
||||
int cmp = memcmp(a->p, b->p, PHF_MIN(a->n, b->n));
|
||||
if (cmp)
|
||||
return cmp;
|
||||
if (a->n > b->n)
|
||||
return -1;
|
||||
@ -415,8 +415,8 @@ static inline uint32_t phf_f(uint32_t d, T k, uint32_t seed) {
|
||||
static inline uint32_t phf_g(uint64_t k, uint32_t seed) {
|
||||
uint32_t h1 = seed;
|
||||
|
||||
h1 = phf_round32(k, h1);
|
||||
h1 = phf_round32(k >> 32, h1);
|
||||
h1 = phf_round32(static_cast<uint32_t>(k), h1);
|
||||
h1 = phf_round32(static_cast<uint32_t>(k >> 32), h1);
|
||||
|
||||
return phf_mix32(h1);
|
||||
} /* phf_g() */
|
||||
@ -519,7 +519,8 @@ PHF_PUBLIC int PHF::init(struct phf *phf, const key_t k[], const size_t n, const
|
||||
uint32_t d_max = 0; /* maximum displacement value */
|
||||
int error;
|
||||
|
||||
if ((phf->nodiv = nodiv)) {
|
||||
phf->nodiv = nodiv;
|
||||
if (phf->nodiv) {
|
||||
/* round to power-of-2 so we can use bit masks instead of modulo division */
|
||||
r = phf_powerup(n1 / PHF_MIN(l1, n1));
|
||||
m = phf_powerup((n1 * 100) / a1);
|
||||
@ -532,24 +533,28 @@ PHF_PUBLIC int PHF::init(struct phf *phf, const key_t k[], const size_t n, const
|
||||
if (r == 0 || m == 0)
|
||||
return ERANGE;
|
||||
|
||||
if (!(B_k = static_cast<phf_key<key_t> *>(calloc(n1, sizeof *B_k))))
|
||||
B_k = static_cast<phf_key<key_t> *>(calloc(n1, sizeof *B_k));
|
||||
if (!B_k)
|
||||
goto syerr;
|
||||
if (!(B_z = static_cast<size_t *>(calloc(r, sizeof *B_z))))
|
||||
|
||||
B_z = static_cast<size_t *>(calloc(r, sizeof *B_z));
|
||||
if (!B_z)
|
||||
goto syerr;
|
||||
|
||||
for (size_t i = 0; i < n; i++) {
|
||||
phf_hash_t g = phf_g_mod_r<nodiv>(k[i], seed, r);
|
||||
phf_hash_t gt = phf_g_mod_r<nodiv>(k[i], seed, r);
|
||||
|
||||
B_k[i].k = k[i];
|
||||
B_k[i].g = g;
|
||||
B_k[i].n = &B_z[g];
|
||||
B_k[i].g = gt;
|
||||
B_k[i].n = &B_z[gt];
|
||||
++*B_k[i].n;
|
||||
}
|
||||
|
||||
qsort(B_k, n1, sizeof *B_k, reinterpret_cast<int(*)(const void *, const void *)>(&phf_keycmp<key_t>));
|
||||
|
||||
T_n = PHF_HOWMANY(m, PHF_BITS(*T));
|
||||
if (!(T = static_cast<phf_bits_t *>(calloc(T_n * 2, sizeof *T))))
|
||||
T = static_cast<phf_bits_t *>(calloc(T_n * 2, sizeof *T));
|
||||
if (!T)
|
||||
goto syerr;
|
||||
T_b = &T[T_n]; /* share single allocation */
|
||||
|
||||
@ -563,7 +568,8 @@ PHF_PUBLIC int PHF::init(struct phf *phf, const key_t k[], const size_t n, const
|
||||
* end of the outer loop.
|
||||
*/
|
||||
|
||||
if (!(g = static_cast<uint32_t *>(calloc(r, sizeof *g))))
|
||||
g = static_cast<uint32_t *>(calloc(r, sizeof *g));
|
||||
if (!g)
|
||||
goto syerr;
|
||||
|
||||
B_p = B_k;
|
||||
@ -579,12 +585,12 @@ retry:
|
||||
Bi_pe = B_p + *B_p->n;
|
||||
|
||||
for (; Bi_p < Bi_pe; Bi_p++) {
|
||||
f = phf_f_mod_m<nodiv>(d, Bi_p->k, seed, m);
|
||||
f = phf_f_mod_m<nodiv>((uint32_t)d, Bi_p->k, (uint32_t)seed, m);
|
||||
|
||||
if (phf_isset(T, f) || phf_isset(T_b, f)) {
|
||||
/* reset T_b[] */
|
||||
for (Bi_p = B_p; Bi_p < Bi_pe; Bi_p++) {
|
||||
f = phf_f_mod_m<nodiv>(d, Bi_p->k, seed, m);
|
||||
f = phf_f_mod_m<nodiv>((uint32_t)d, Bi_p->k, (uint32_t)seed, m);
|
||||
phf_clrbit(T_b, f);
|
||||
}
|
||||
|
||||
@ -596,13 +602,13 @@ retry:
|
||||
|
||||
/* commit to T[] */
|
||||
for (Bi_p = B_p; Bi_p < Bi_pe; Bi_p++) {
|
||||
f = phf_f_mod_m<nodiv>(d, Bi_p->k, seed, m);
|
||||
f = phf_f_mod_m<nodiv>((uint32_t)d, Bi_p->k, (uint32_t)seed, m);
|
||||
phf_setbit(T, f);
|
||||
}
|
||||
|
||||
/* commit to g[] */
|
||||
g[B_p->g] = d;
|
||||
d_max = PHF_MAX(d, d_max);
|
||||
g[B_p->g] = (uint32_t)d;
|
||||
d_max = PHF_MAX((uint32_t)d, d_max);
|
||||
}
|
||||
|
||||
phf->seed = seed;
|
||||
@ -643,7 +649,7 @@ clean:
|
||||
template<typename dst_t, typename src_t>
|
||||
static inline void phf_memmove(dst_t *dst, src_t *src, size_t n) {
|
||||
for (size_t i = 0; i < n; i++) {
|
||||
dst_t tmp = src[i];
|
||||
dst_t tmp = (dst_t)src[i];
|
||||
dst[i] = tmp;
|
||||
}
|
||||
} /* phf_memmove() */
|
||||
@ -750,7 +756,7 @@ PHF_PUBLIC phf_hash_t PHF::hash(struct phf *phf, T k) {
|
||||
return phf_hash_<true>(reinterpret_cast<uint32_t *>(phf->g), k, phf->seed, phf->r, phf->m);
|
||||
default:
|
||||
abort();
|
||||
return 0;
|
||||
// return 0;
|
||||
}
|
||||
#endif
|
||||
} /* PHF::hash() */
|
||||
|
||||
@ -106,6 +106,7 @@ add_library(marian STATIC
|
||||
$<TARGET_OBJECTS:SQLiteCpp>
|
||||
$<TARGET_OBJECTS:pathie-cpp>
|
||||
$<TARGET_OBJECTS:zlib>
|
||||
$<TARGET_OBJECTS:faiss>
|
||||
)
|
||||
target_compile_options(marian PUBLIC ${ALL_WARNINGS})
|
||||
|
||||
|
||||
@ -10,21 +10,6 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
// The macro MAYBE_UNUSED is used to selectively disable
|
||||
// unused-variable warnings. C++17 defines the attribute
|
||||
// [[maybe_unused]], but I don't think we're at C++17 yet. We can add it when we reach C++17.
|
||||
// The compilers gcc and clang (and maybe others) define
|
||||
// __has_attribute and support __attribute__(unused) in C++11,
|
||||
#if defined __has_attribute
|
||||
# if __has_attribute(unused)
|
||||
# define MAYBE_UNUSED __attribute__((unused))
|
||||
# else
|
||||
# define MAYBE_UNUSED
|
||||
# endif
|
||||
#else
|
||||
# define MAYBE_UNUSED
|
||||
#endif
|
||||
|
||||
#define THREAD_GUARD(body) [&]() { body; }() // test if THREAD_GUARD is neccessary, remove if no problems occur.
|
||||
#define NodeOp(op) [=]() { op; }
|
||||
|
||||
|
||||
@ -414,7 +414,8 @@ double parseNumber(std::string param) {
|
||||
}
|
||||
// we allow users to place commas in numbers (note: we are not actually verifying that they are in
|
||||
// the right place)
|
||||
std::remove_if(param.begin(), param.end(), [](char c) { return c == ','; });
|
||||
auto it = std::remove_if(param.begin(), param.end(), [](char c) { return c == ','; }); // use return value for future-proofing against nodiscard warning
|
||||
param.erase(it, param.end()); // since we have that iterator now, we might as well shrink to fit
|
||||
return factor * parseDouble(param);
|
||||
}
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ struct FbgemmPacked16PackNodeOp : public UnaryNodeOp {
|
||||
|
||||
const std::string type() override { return "packMatFp16"; }
|
||||
|
||||
Shape newShape(Expr MAYBE_UNUSED a, bool MAYBE_UNUSED transpose) {
|
||||
Shape newShape(Expr a, bool transpose) {
|
||||
#if USE_FBGEMM
|
||||
auto shapeMat = a->shape();
|
||||
// Should be 2D - weight matrix
|
||||
@ -118,6 +118,7 @@ struct FbgemmPacked16PackNodeOp : public UnaryNodeOp {
|
||||
Shape outShape({(int)packsize_});
|
||||
return outShape;
|
||||
#else
|
||||
a; transpose;
|
||||
ABORT("Packed GEMM requires a build with USE_FBGEMM enabled");
|
||||
return Shape();
|
||||
#endif // USE_FBGEMM
|
||||
|
||||
@ -25,13 +25,16 @@
|
||||
namespace marian {
|
||||
|
||||
template <typename InIt, typename OutIt>
|
||||
void copy(Ptr<Backend>& MAYBE_UNUSED backend, const InIt beg, const InIt end, OutIt it) {
|
||||
void copy(Ptr<Backend>& backend, const InIt beg, const InIt end, OutIt it) {
|
||||
#ifdef CUDA_FOUND
|
||||
if(backend->getDeviceId().type == DeviceType::gpu)
|
||||
gpu::copy(backend, beg, end, it);
|
||||
else
|
||||
#endif
|
||||
std::copy(beg, end, it);
|
||||
#else
|
||||
backend;
|
||||
std::copy(beg, end, it);
|
||||
#endif
|
||||
}
|
||||
|
||||
DISPATCH2(CopyCast, marian::Tensor, const marian::Tensor);
|
||||
@ -190,7 +193,7 @@ void LayerNormalizationGrad(Tensor gradX,
|
||||
}
|
||||
|
||||
static inline void LayerNormalizationGrad(
|
||||
Ptr<Allocator> MAYBE_UNUSED allocator,
|
||||
Ptr<Allocator> allocator,
|
||||
Tensor gradX,
|
||||
Tensor gradGamma,
|
||||
Tensor gradBeta,
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<AdditionalOptions>/bigobj /arch:AVX %(AdditionalOptions)</AdditionalOptions>
|
||||
@ -107,7 +107,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<AdditionalOptions>/d2Zi+ /bigobj /arch:AVX %(AdditionalOptions)</AdditionalOptions>
|
||||
@ -144,44 +144,44 @@
|
||||
<ClCompile Include="..\src\3rd_party\faiss\Index.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\IndexLSH.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\utils\hamming.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\utils\Heap.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\utils\misc.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\utils\random.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\faiss\VectorTransform.cpp">
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">USE_ONNX=1;USE_MKL;ASMJIT_EXPORTS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE; FBGEMM_EXPORTS; USE_FBGEMM=1; USE_SSE2=1; CUDA_FOUND=1; MKL_FOUND=1; FINTEGER=uint64_t; MPI_FOUND=1; BLAS_FOUND=1; MKL_ILP64; WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\3rd_party\fbgemm\bench\BenchUtils.cc">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user