IPP unable to patch lz4-1.9.3 using lz4-1.9.3.patch.bin - Windows

[arun-kv]

Hi, I'm unable to patch lz4-1.9.3 using lz4-1.9.3.patch.bin, I'm getting below conflicts while trying to patch.

C:\Users\akv\Desktop\work\lz4-1.9.3>"c:\Program Files (x86)\GnuWin32\bin\patch.exe" -p1 --binary < c:\Users\akv\Desktop\lz4-1.9.3.patch.bin
(Stripping trailing CRs from patch.)
patching file build/cmake/CMakeLists.txt
(Stripping trailing CRs from patch.)
patching file build/VS2010/datagen/datagen.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 166.
Hunk #5 FAILED at 202.
Hunk #6 FAILED at 242.
Hunk #7 FAILED at 286.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/datagen/datagen.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/frametest/frametest.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 166.
Hunk #5 FAILED at 202.
Hunk #6 FAILED at 242.
Hunk #7 FAILED at 286.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/frametest/frametest.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/fullbench/fullbench.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 166.
Hunk #5 FAILED at 202.
Hunk #6 FAILED at 242.
Hunk #7 FAILED at 286.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/fullbench/fullbench.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/fullbench-dll/fullbench-dll.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 168.
Hunk #5 FAILED at 206.
Hunk #6 FAILED at 248.
Hunk #7 FAILED at 294.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/fullbench-dll/fullbench-dll.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/fuzzer/fuzzer.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 166.
Hunk #5 FAILED at 202.
Hunk #6 FAILED at 242.
Hunk #7 FAILED at 286.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/fuzzer/fuzzer.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/liblz4/liblz4.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 173.
Hunk #5 FAILED at 211.
Hunk #6 FAILED at 253.
Hunk #7 FAILED at 299.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/liblz4/liblz4.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/liblz4-dll/liblz4-dll.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 174.
Hunk #5 FAILED at 208.
Hunk #6 FAILED at 246.
Hunk #7 FAILED at 288.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/liblz4-dll/liblz4-dll.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/lz4/lz4.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 47.
Hunk #4 FAILED at 167.
Hunk #5 FAILED at 204.
Hunk #6 FAILED at 245.
Hunk #7 FAILED at 290.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2010/lz4/lz4.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2010/lz4.sln
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file build/VS2010/lz4.sln.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/datagen/datagen.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 174.
Hunk #7 FAILED at 210.
Hunk #8 FAILED at 250.
Hunk #9 FAILED at 294.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/datagen/datagen.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/frametest/frametest.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 174.
Hunk #7 FAILED at 210.
Hunk #8 FAILED at 250.
Hunk #9 FAILED at 294.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/frametest/frametest.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/fullbench/fullbench.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 174.
Hunk #7 FAILED at 210.
Hunk #8 FAILED at 250.
Hunk #9 FAILED at 294.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/fullbench/fullbench.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/fullbench-dll/fullbench-dll.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 176.
Hunk #7 FAILED at 214.
Hunk #8 FAILED at 256.
Hunk #9 FAILED at 302.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/fullbench-dll/fullbench-dll.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/fuzzer/fuzzer.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 174.
Hunk #7 FAILED at 210.
Hunk #8 FAILED at 250.
Hunk #9 FAILED at 294.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/fuzzer/fuzzer.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/liblz4/liblz4.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 73.
Hunk #5 FAILED at 87.
Hunk #6 FAILED at 181.
Hunk #7 FAILED at 219.
Hunk #8 FAILED at 261.
Hunk #9 FAILED at 307.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/liblz4/liblz4.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/liblz4-dll/liblz4-dll.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 17.
Hunk #3 FAILED at 49.
Hunk #4 FAILED at 74.
Hunk #5 FAILED at 88.
Hunk #6 FAILED at 182.
Hunk #7 FAILED at 216.
Hunk #8 FAILED at 254.
Hunk #9 FAILED at 296.
9 out of 9 hunks FAILED -- saving rejects to file build/VS2017/liblz4-dll/liblz4-dll.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/lz4/lz4.vcxproj
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 47.
Hunk #3 FAILED at 77.
Hunk #4 FAILED at 154.
Hunk #5 FAILED at 181.
Hunk #6 FAILED at 218.
Hunk #7 FAILED at 255.
7 out of 7 hunks FAILED -- saving rejects to file build/VS2017/lz4/lz4.vcxproj.rej
(Stripping trailing CRs from patch.)
patching file build/VS2017/lz4.sln
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file build/VS2017/lz4.sln.rej
(Stripping trailing CRs from patch.)
patching file examples/Makefile
(Stripping trailing CRs from patch.)
patching file lib/dll/example/Makefile
(Stripping trailing CRs from patch.)
patching file lib/lz4.c
(Stripping trailing CRs from patch.)
patching file lib/Makefile
(Stripping trailing CRs from patch.)
patching file ossfuzz/Makefile
(Stripping trailing CRs from patch.)
patching file programs/Makefile
(Stripping trailing CRs from patch.)
patching file tests/Makefile

C:\Users\akv\Desktop\work\lz4-1.9.3>

[VidyalathaB_Intel]

Hi,

Thanks for reaching out to us.

We are working on it internally. we will get back to you soon.

Regards,

Vidya.

[Abhinav_S_Intel]

Hi Arun,

Can you share your open source LZ4 downloaded link and steps you performed to unarchive the package?

As a workaround, please use the IPP LZ4 patch without the "--binary" option.

Our early investigation shows this issue is due to different end-of-lines in patch file and patched source code files.

-
Abhinav

[arun-kv]

@VidyalathaB_Intel  @Abhinav_S_Intel  Thank you for the reply.

Without --binary option  I'm able to patch lz4.

Source code link : https://github.com/lz4/lz4/releases/tag/v1.9.3 ( Source code.zip)

I have used 7-zip to unarchive the zip file.

Patch command used: C:\Users\akv\Desktop\work\lz4-1.9.3>"c:\Program Files (x86)\GnuWin32\bin\patch.exe" -p1 --binary < c:\Users\akv\Desktop\lz4-1.9.3.patch.bin

Now I'm getting compilation issue like below, "cannot open include file 'lz4.h'", I'm using Visual studio 2019

same error was given by "programs/lz4io.c" also, that I resolved by adding "lz4-1.9.3/lib" to "Additional Include Directories"

Thanks,

Arun.

[Abhinav_S_Intel]

Hi Arun,

First of all please configure Visual Studio to link with IPP. Refer to this article, if you've chosen automatic integration or else you have to manually configure your project:
https://software.intel.com/content/www/us/en/develop/documentation/dev-guide-ipp-for-oneapi/top/programming-with-intel-integrated-performance-primitives-in-the-microsoft-visual-studio-ide/configuring-the-microsoft-visual-studio-ide-to-link-with-intel-ipp.html 

This seems more like an Visual Studio configuration/upgrade issue.

I am also using Visual Studio 2019 and upgraded the solution from 2017 which is available at lz4-1.9.3\build\VS2017\lz.sln

Without applying IPP patch, I was able to compile 32 bit binaries without any issues but not 64 bit. I am getting similar errors like you reported. After applying the IPP patch the situation still remains the same.

The next test which I performed was to use the 2010 solution and upgraded to latest SDK supported by Visual Studio 2019. The solution is available at lz4-1.9.3\build\VS2010\lz.sln

With and without IPP patch, I was able to compile 32 and 64 binaries. This issue needs more investigation on why the compilation failed with 2017 solution.

Please let us know about your test results.

-
Abhinav

[arun-kv]

@Abhinav_S_Intel  VS2010\lz.sln works for me. 

Thank you so much for the help.