Skip to content
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

change path #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change path #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions TouhouVideoFeatureExtractor.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.5.props" />
<Import Project="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\extras\visual_studio_integration\MSBuildExtensions\CUDA 11.5.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Expand All @@ -42,12 +42,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>C:\Users\unknown\source\repos\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>C:\Users\unknown\source\repos\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
<IncludePath>C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\Interface</IncludePath>
<LibraryPath>C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>C:\Users\unknown\source\repos\FFmpeg\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Users\unknown\source\repos\FFmpeg\lib\x64;$(LibraryPath)</LibraryPath>
<IncludePath>C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\Interface</IncludePath>
<LibraryPath>C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -60,12 +60,16 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>nppisu.lib;nppig.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;nvcuvid.lib;nvinfer.lib;cuda.lib;cudart_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
<AdditionalOptions>-std=c++17 --expt-relaxed-constexpr %(AdditionalOptions)</AdditionalOptions>
<CodeGeneration>compute_75,sm_75;compute_86,sm_86</CodeGeneration>
</CudaCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand All @@ -82,6 +86,7 @@
<OptimizeReferences>true</OptimizeReferences>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>nppig.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;nvcuvid.lib;nvinfer.lib;cuda.lib;cudart_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
Expand Down Expand Up @@ -146,6 +151,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.5.targets" />
<Import Project="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\extras\visual_studio_integration\MSBuildExtensions\CUDA 11.5.targets" />
</ImportGroup>
</Project>
2 changes: 1 addition & 1 deletion fast_io/fast_io_core_impl/concepts/operation_details.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace fast_io
template<typename T>
concept type_has_c_str_method = requires(T&& t)
{
{t.c_str()}->::fast_io::details::c_str_pointer;
{t.c_str()}->fast_io::details::c_str_pointer;
};

template<typename T>
Expand Down
20 changes: 15 additions & 5 deletions main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ struct VideoProvider {
delete file;
}

std::string clean_line_string(std::string line)
{
size_t n = line.find_last_not_of(" \r\n\t");
if (n != std::string::npos) {
line.erase(n + 1, line.size() - n);
}

return line;
}

std::optional<std::tuple<std::string, std::string>> TryFetchNextVideo() {
std::string video_id;
std::string filepath;
Expand All @@ -63,11 +73,11 @@ struct VideoProvider {
catch (...) {
return {};
}
return { { video_id , filepath } };
return { { clean_line_string(video_id) , clean_line_string(filepath) } };
}
};

enum class TLVTags: u8 {
enum class TLVTags : u8 {
VideoId = 0, //av or BV
BasicInfo = 1,
FeatureIndices = 2,
Expand All @@ -85,7 +95,7 @@ struct ReorderBuffer {
typename decorators,
std::size_t bfs, ::fast_io::freestanding::random_access_iterator Iter
> requires (((mde& fast_io::buffer_mode::out) == fast_io::buffer_mode::out) && fast_io::details::allow_iobuf_punning<typename decorators::internal_type, Iter>)
bool Complete(usize pos, fast_io::basic_io_buffer<handletype, mde, decorators, bfs>& bios, u8 const* const data) {
bool Complete(usize pos, fast_io::basic_io_buffer<handletype, mde, decorators, bfs>& bios, u8 const* const data) {

}
};
Expand All @@ -105,7 +115,7 @@ nvinfer1::ICudaEngine* LoadEngineFromFile(std::string_view filename, nvinfer1::I
return nullptr;
}

int main(int argc, char **argv)
int main(int argc, char** argv)
{
if (argc != 3) {
perrln("Usage: ", fast_io::mnp::os_c_str(argv[0]), " <saved-feature-file> <video-list-file>");
Expand Down Expand Up @@ -236,4 +246,4 @@ int main(int argc, char **argv)
fast_io::flush(fast_io::c_stdout());

return 0;
}
}