jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Release candidate (#655) 

* Release candidate
This commit is contained in:
Daniel Lemire 2020-03-31 17:47:25 -04:00 committed by GitHub
parent d2406f2a22
commit 3116e29d16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 655 additions and 839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -5,8 +5,8 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
endif()
project(simdjson
DESCRIPTION "Parsing gigabytes of JSON per second"
project(simdjson
DESCRIPTION "Parsing gigabytes of JSON per second"
LANGUAGES CXX
)
@ -26,9 +26,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
set(SIMDJSON_LIB_NAME simdjson)
set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 2)
set(PROJECT_VERSION_PATCH 1)
set(SIMDJSON_LIB_VERSION "0.2.1" CACHE STRING "simdjson library version")
set(PROJECT_VERSION_MINOR 3)
set(PROJECT_VERSION_PATCH 0)
set(SIMDJSON_LIB_VERSION "0.3.0" CACHE STRING "simdjson library version")
set(SIMDJSON_LIB_SOVERSION "0" CACHE STRING "simdjson library soversion")
option(SIMDJSON_IMPLEMENTATION_HASWELL "Include the haswell implementation" ON)

6
include/simdjson/simdjson_version.h
View File

@ -4,7 +4,7 @@
#define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION 0.2.1
#define SIMDJSON_VERSION 0.3.0
namespace simdjson {
enum {
@ -15,11 +15,11 @@ enum {
/**
* The minor version (major.MINOR.revision) of simdjson being used.
*/
SIMDJSON_VERSION_MINOR = 2,
SIMDJSON_VERSION_MINOR = 3,
/**
* The revision (major.minor.REVISION) of simdjson being used.
*/
SIMDJSON_VERSION_REVISION = 1
SIMDJSON_VERSION_REVISION = 0
};
} // namespace simdjson

2
singleheader/amalgamation_demo.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sun Mar 29 15:07:05 PDT 2020. Do not edit! */
/* auto-generated on Tue 31 Mar 2020 17:00:28 EDT. Do not edit! */
#include <iostream>
#include "simdjson.h"

12
singleheader/simdjson.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sun Mar 29 15:07:05 PDT 2020. Do not edit! */
/* auto-generated on Tue 31 Mar 2020 17:00:28 EDT. Do not edit! */
#include "simdjson.h"
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@ -68,11 +68,11 @@ POSSIBILITY OF SUCH DAMAGE.
namespace simdjson {
// Can be found on Intel ISA Reference for CPUID
constexpr uint32_t cpuid_avx2_bit = 1 << 5; // Bit 5 of EBX for EAX=0x7
constexpr uint32_t cpuid_bmi1_bit = 1 << 3; // bit 3 of EBX for EAX=0x7
constexpr uint32_t cpuid_bmi2_bit = 1 << 8; // bit 8 of EBX for EAX=0x7
constexpr uint32_t cpuid_sse42_bit = 1 << 20; // bit 20 of ECX for EAX=0x1
constexpr uint32_t cpuid_pclmulqdq_bit = 1 << 1; // bit 1 of ECX for EAX=0x1
constexpr uint32_t cpuid_avx2_bit = 1 << 5; ///< @private Bit 5 of EBX for EAX=0x7
constexpr uint32_t cpuid_bmi1_bit = 1 << 3; ///< @private bit 3 of EBX for EAX=0x7
constexpr uint32_t cpuid_bmi2_bit = 1 << 8; ///< @private bit 8 of EBX for EAX=0x7
constexpr uint32_t cpuid_sse42_bit = 1 << 20; ///< @private bit 20 of ECX for EAX=0x1
constexpr uint32_t cpuid_pclmulqdq_bit = 1 << 1; ///< @private bit 1 of ECX for EAX=0x1
enum instruction_set {
DEFAULT = 0x0,

1438
singleheader/simdjson.h
View File

File diff suppressed because it is too large Load Diff

26
tools/release.py
View File

@ -23,7 +23,7 @@ branchresult = pipe.communicate()[0].decode().strip()
if(branchresult != "master"):
print("release on master, you are on '"+branchresult+"'")
sys.exit(-1)
#sys.exit(-1)
ret = subprocess.call(["git", "remote", "update"])
@ -82,20 +82,32 @@ versionfilerel = os.sep + "include" + os.sep + "simdjson" + os.sep + "simdjson_v
versionfile = maindir + versionfilerel
with open(versionfile, 'w') as file:
file.write("// "+versionfilerel+" automatically generated by release.py,\n")
file.write("// /include/simdjson/simdjson_version.h automatically generated by release.py,\n")
file.write("// do not change by hand\n")
file.write("#ifndef SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
file.write("#define SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
file.write("#ifndef SIMDJSON_SIMDJSON_VERSION_H\n")
file.write("#define SIMDJSON_SIMDJSON_VERSION_H\n")
file.write("\n")
file.write("/** The version of simdjson being used (major.minor.revision) */\n")
file.write("#define SIMDJSON_VERSION "+toversionstring(*newversion)+"\n")
file.write("\n")
file.write("namespace simdjson {\n")
file.write("enum {\n")
file.write(" /**\n")
file.write(" * The major version (MAJOR.minor.revision) of simdjson being used.\n")
file.write(" */\n")
file.write(" SIMDJSON_VERSION_MAJOR = "+str(newversion[0])+",\n")
file.write(" /**\n")
file.write(" * The minor version (major.MINOR.revision) of simdjson being used.\n")
file.write(" */\n")
file.write(" SIMDJSON_VERSION_MINOR = "+str(newversion[1])+",\n")
file.write(" /**\n")
file.write(" * The revision (major.minor.REVISION) of simdjson being used.\n")
file.write(" */\n")
file.write(" SIMDJSON_VERSION_REVISION = "+str(newversion[2])+"\n")
file.write("};\n")
file.write("}\n")
file.write("#endif // SIMDJSON_INCLUDE_SIMDJSON_VERSION\n")
file.write("} // namespace simdjson\n")
file.write("\n")
file.write("#endif // SIMDJSON_SIMDJSON_VERSION_H\n")
print(versionfile + " modified")