Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
638b1190
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
638b1190
编写于
4月 17, 2020
作者:
Z
zhoufeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
windows sqlite patch
上级
f5aa3a2e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
152 addition
and
17 deletion
+152
-17
CMakeLists.txt
CMakeLists.txt
+3
-0
cmake/external_libs/sqlite.cmake
cmake/external_libs/sqlite.cmake
+8
-14
cmake/package.cmake
cmake/package.cmake
+1
-0
cmake/utils.cmake
cmake/utils.cmake
+7
-3
third_party/patch/sqlite/sqlite.windows.patch001
third_party/patch/sqlite/sqlite.windows.patch001
+133
-0
未找到文件。
CMakeLists.txt
浏览文件 @
638b1190
...
...
@@ -20,6 +20,9 @@ set(PYBIND11_CPP_STANDARD -std=c++17)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
OPTION_CXX_FLAGS
}
"
)
find_package
(
Threads
)
find_package
(
Patch
)
message
(
PATCH_EXECUTABLE =
${
Patch_EXECUTABLE
}
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/mind_expression.cmake
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/third_party/flatbuffers/include
)
...
...
cmake/external_libs/sqlite.cmake
浏览文件 @
638b1190
if
(
WIN32
)
mindspore_add_pkg
(
sqlite-head
VER 3.31.1
HEAD_ONLY ./
URL https://sqlite.org/2020/sqlite-amalgamation-3310100.zip
MD5 2b7bfcdd97dc281903a9aee966213fe4
)
include_directories
(
${
sqlite-head_INC
}
)
mindspore_add_pkg
(
sqlite
VER 3.31.1
LIBS sqlite3
LIB_PATH ./
HEAD_ONLY ./
RELEASE ON
URL https://sqlite.org/2020/sqlite-dll-win64-x64-3310100.zip
MD5 662c9d2b05467d590ba5c0443e7fd6bd
)
VER 3.31.1
LIBS sqlite3
URL https://sqlite.org/2020/sqlite-amalgamation-3310100.zip
MD5 2b7bfcdd97dc281903a9aee966213fe4
PATCHES
${
CMAKE_SOURCE_DIR
}
/third_party/patch/sqlite/sqlite.windows.patch001
CMAKE_OPTION
" "
)
else
()
set
(
sqlite_USE_STATIC_LIBS ON
)
...
...
@@ -30,7 +24,7 @@ else ()
MD5 5f4e7b4016c15f4fb5855615279819da
PATCHES
${
CMAKE_SOURCE_DIR
}
/third_party/patch/sqlite/sqlite.patch001
CONFIGURE_COMMAND ./configure --enable-shared=no --disable-tcl --disable-editline --enable-json1
)
include_directories
(
${
sqlite_INC
}
)
endif
()
include_directories
(
${
sqlite_INC
}
)
add_library
(
mindspore::sqlite ALIAS sqlite::sqlite3
)
cmake/package.cmake
浏览文件 @
638b1190
...
...
@@ -38,6 +38,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
set
(
glog_LIBPATH
${
glog_LIBPATH
}
/../bin/
)
set
(
opencv_LIBPATH
${
opencv_LIBPATH
}
/../bin/
)
set
(
jpeg_turbo_LIBPATH
${
jpeg_turbo_LIBPATH
}
/../bin/
)
set
(
sqlite_LIBPATH
${
sqlite_LIBPATH
}
/../bin/
)
else
()
set
(
INSTALL_LIB_DIR
"lib"
)
endif
()
...
...
cmake/utils.cmake
浏览文件 @
638b1190
...
...
@@ -282,12 +282,16 @@ function(mindspore_add_pkg pkg_name )
message
(
"
${
pkg_name
}
_SOURCE_DIR :
${${
pkg_name
}
_SOURCE_DIR
}
"
)
foreach
(
_PATCH_FILE
${
PKG_PATCHES
}
)
message
(
"patching
${${
pkg_name
}
_SOURCE_DIR
}
-p1 <
${
_PATCH_FILE
}
"
)
execute_process
(
COMMAND patch -p1 INPUT_FILE
${
_PATCH_FILE
}
get_filename_component
(
_PATCH_FILE_NAME
${
_PATCH_FILE
}
NAME
)
set
(
_LF_PATCH_FILE
${
CMAKE_BINARY_DIR
}
/_ms_patch/
${
_PATCH_FILE_NAME
}
)
configure_file
(
${
_PATCH_FILE
}
${
_LF_PATCH_FILE
}
NEWLINE_STYLE LF
)
message
(
"patching
${${
pkg_name
}
_SOURCE_DIR
}
-p1 <
${
_LF_PATCH_FILE
}
"
)
execute_process
(
COMMAND
${
Patch_EXECUTABLE
}
-p1 INPUT_FILE
${
_LF_PATCH_FILE
}
WORKING_DIRECTORY
${${
pkg_name
}
_SOURCE_DIR
}
RESULT_VARIABLE Result
)
if
(
NOT Result EQUAL
"0"
)
message
(
FATAL_ERROR
"Failed patch:
${
_PATCH_FILE
}
"
)
message
(
FATAL_ERROR
"Failed patch:
${
_
LF_
PATCH_FILE
}
"
)
endif
()
endforeach
(
_PATCH_FILE
)
...
...
third_party/patch/sqlite/sqlite.windows.patch001
0 → 100644
浏览文件 @
638b1190
diff -uprN sqlite-amalgamation-3310100/CMakeLists.txt sqlite-patch/CMakeLists.txt
--- sqlite-amalgamation-3310100/CMakeLists.txt 1970-01-01 08:00:00.000000000 +0800
+++ sqlite-patch/CMakeLists.txt 2020-04-18 09:16:28.258637600 +0800
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.14)
+project (Sqlite[C])
+add_library(sqlite3 SHARED sqlite3.c)
+set_target_properties(sqlite3 PROPERTIES PUBLIC_HEADER "sqlite3.h;sqlite3ext.h")
+include(GNUInstallDirs)
+install(TARGETS sqlite3 PUBLIC_HEADER)
diff -uprN sqlite-amalgamation-3310100/sqlite3.c sqlite-patch/sqlite3.c
--- sqlite-amalgamation-3310100/sqlite3.c 2020-01-28 03:25:14.000000000 +0800
+++ sqlite-patch/sqlite3.c 2020-04-17 15:40:21.005440300 +0800
@@ -1167,7 +1167,7 @@
extern "C" {
*/
#define SQLITE_VERSION "3.31.1"
#define SQLITE_VERSION_NUMBER 3031001
-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6"
+#define SQLITE_SOURCE_ID "2020-02-17 19:25:07 387240fc85ea3549ff8a6ed060ef07c6184548457fb91cd7c6fc39ddb678alt1"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -17428,8 +17428,11 @@
struct Table {
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
# define IsVirtual(X) ((X)->nModuleArg)
+# define ExprIsVtab(X) \
+ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
#else
# define IsVirtual(X) 0
+# define ExprIsVtab(X) 0
#endif
/*
@@ -104133,19 +104136,25 @@
static int impliesNotNullRow(Walker *pWa
case TK_LT:
case TK_LE:
case TK_GT:
- case TK_GE:
+ case TK_GE: {
+ Expr *pLeft = pExpr->pLeft;
+ Expr *pRight = pExpr->pRight;
testcase( pExpr->op==TK_EQ );
testcase( pExpr->op==TK_NE );
testcase( pExpr->op==TK_LT );
testcase( pExpr->op==TK_LE );
testcase( pExpr->op==TK_GT );
testcase( pExpr->op==TK_GE );
- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
+ /* The y.pTab=0 assignment in wherecode.c always happens after the
+ ** impliesNotNullRow() test */
+ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
+ && IsVirtual(pLeft->y.pTab))
+ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
+ && IsVirtual(pRight->y.pTab))
){
- return WRC_Prune;
+ return WRC_Prune;
}
-
+ }
default:
return WRC_Continue;
}
@@ -142591,7 +142600,8 @@
static int isAuxiliaryVtabOperator(
** MATCH(expression,vtab_column)
*/
pCol = pList->a[1].pExpr;
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
+ if( ExprIsVtab(pCol) ){
for(i=0; i<ArraySize(aOp); i++){
if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
*peOp2 = aOp[i].eOp2;
@@ -142613,7 +142623,8 @@
static int isAuxiliaryVtabOperator(
** with function names in an arbitrary case.
*/
pCol = pList->a[0].pExpr;
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
+ if( ExprIsVtab(pCol) ){
sqlite3_vtab *pVtab;
sqlite3_module *pMod;
void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
@@ -142636,10 +142647,12 @@
static int isAuxiliaryVtabOperator(
int res = 0;
Expr *pLeft = pExpr->pLeft;
Expr *pRight = pExpr->pRight;
- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
+ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
+ if( ExprIsVtab(pLeft) ){
res++;
}
- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
+ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
+ if( pRight && ExprIsVtab(pRight) ){
res++;
SWAP(Expr*, pLeft, pRight);
}
@@ -223667,7 +223680,7 @@
static void fts5SourceIdFunc(
){
assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused);
- sqlite3_result_text(pCtx, "fts5: 2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6", -1, SQLITE_TRANSIENT);
+ sqlite3_result_text(pCtx, "fts5: 2020-02-17 19:25:07 abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d", -1, SQLITE_TRANSIENT);
}
/*
@@ -228440,9 +228453,9 @@
SQLITE_API int sqlite3_stmt_init(
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
/************** End of stmt.c ************************************************/
-#if __LINE__!=228443
+#if __LINE__!=228456
#undef SQLITE_SOURCE_ID
-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt2"
+#define SQLITE_SOURCE_ID "2020-02-17 19:25:07 387240fc85ea3549ff8a6ed060ef07c6184548457fb91cd7c6fc39ddb678alt2"
#endif
/* Return the source-id for this library */
SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
diff -uprN sqlite-amalgamation-3310100/sqlite3.h sqlite-patch/sqlite3.h
--- sqlite-amalgamation-3310100/sqlite3.h 2020-01-28 03:25:14.000000000 +0800
+++ sqlite-patch/sqlite3.h 2020-04-17 15:40:21.005440300 +0800
@@ -125,7 +125,7 @@
extern "C" {
*/
#define SQLITE_VERSION "3.31.1"
#define SQLITE_VERSION_NUMBER 3031001
-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6"
+#define SQLITE_SOURCE_ID "2020-02-17 19:25:07 387240fc85ea3549ff8a6ed060ef07c6184548457fb91cd7c6fc39ddb678alt1"
/*
** CAPI3REF: Run-Time Library Version Numbers
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录