Skip to content

Fixes and improvements for msvc #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lemire merged 5 commits into from
Dec 23, 2022
Merged

Fixes and improvements for msvc #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
230e48e
Fix build output path for VS projects to avoid sharing dirs between p…
pps83 Dec 23, 2022
5ccb55b
Add missing codecfactory.cpp to FastPFor.vcxproj
pps83 Dec 23, 2022
f676f74
Move embedded getopt.h code to msvc folder
pps83 Dec 23, 2022
92f134b
Fix compilation warnings from msvc/getopt.h
pps83 Dec 23, 2022
883dc7d
Remove `using namespace std` from library code
pps83 Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/msvc/Release
/msvc/x64/Debug
/msvc/x64/Release
/msvc/msvc.build
*.suo
*.VC.db
*.VC.opendb
Expand Down
6 changes: 3 additions & 3 deletions headers/simdgroupsimple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ class SIMDGroupSimple : public IntegerCODEC {
// directly instead of calculating it from a looked up bit width.
const uint32_t mask = tableMask[i];
pos = 0;
const size_t maxPos = min(static_cast<size_t>(n), l);
const size_t maxPos = std::min(static_cast<size_t>(n), l);
while (pos < maxPos && quadMaxArray[j + pos] <= mask)
pos++;
if (pos == maxPos)
Expand Down Expand Up @@ -720,7 +720,7 @@ class SIMDGroupSimple : public IntegerCODEC {
while (in128 < endIn128) {
// Step 1: Refill the quad max ring buffer.
const size_t countRemainingIn128 = static_cast<size_t>(endIn128 - in128);
const size_t rbSizeToReach = min(rbMaxSize, countRemainingIn128);
const size_t rbSizeToReach = std::min(rbMaxSize, countRemainingIn128);
for (; rbSize < rbSizeToReach; rbSize++) {
const uint32_t *const in32 =
reinterpret_cast<const uint32_t *>(in128 + rbSize);
Expand All @@ -736,7 +736,7 @@ class SIMDGroupSimple : public IntegerCODEC {
n = tableNum[i];
const uint32_t mask = tableMask[i];
pos = 0;
const size_t maxPos = min(static_cast<size_t>(n), rbSize);
const size_t maxPos = std::min(static_cast<size_t>(n), rbSize);
while (pos < maxPos && quadMaxRb[(rbPos + pos) % rbMaxSize] <= mask)
pos++;
if (pos == maxPos)
Expand Down
2 changes: 0 additions & 2 deletions headers/stringutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

namespace FastPForLib {

using namespace std;

std::vector<std::string> split(const std::string &str, const std::string &del) {
std::vector<std::string> tokens;
size_t lastPos = str.find_first_not_of(del, 0);
Expand Down
4 changes: 1 addition & 3 deletions headers/varintgb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

namespace FastPForLib {

using namespace std;

/**
* Group VarInt.
*
Expand Down Expand Up @@ -204,7 +202,7 @@ template <bool delta = false> class VarIntGB : public IntegerCODEC {
return reinterpret_cast<const uint32_t *>(inbyte);
}

string name() const {
std::string name() const {
if (delta)
return "varintgbdelta";
else
Expand Down
10 changes: 9 additions & 1 deletion msvc/FastPFor.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -74,6 +81,7 @@
<ClCompile Include="..\src\bitpacking.cpp" />
<ClCompile Include="..\src\bitpackingaligned.cpp" />
<ClCompile Include="..\src\bitpackingunaligned.cpp" />
<ClCompile Include="..\src\codecfactory.cpp" />
<ClCompile Include="..\src\horizontalbitpacking.cpp" />
<ClCompile Include="..\src\simdbitpacking.cpp" />
<ClCompile Include="..\src\simdunalignedbitpacking.cpp" />
Expand Down
9 changes: 8 additions & 1 deletion msvc/benchbitpacking.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
9 changes: 8 additions & 1 deletion msvc/codecs.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
9 changes: 8 additions & 1 deletion msvc/csv2maropu.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
9 changes: 8 additions & 1 deletion msvc/entropy.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
9 changes: 8 additions & 1 deletion msvc/example.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
9 changes: 8 additions & 1 deletion msvc/gapstats.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)msvc.build\$(Platform)-$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down
Loading