oneDAL icon indicating copy to clipboard operation
oneDAL copied to clipboard

Test delete compression functionality

Open PetrovKP opened this issue 3 years ago • 4 comments

Description

Please include a summary of the change. For large or complex changes please include enough information to introduce your change and explain motivation for it.

Changes proposed in this pull request:

PetrovKP avatar Oct 27 '20 21:10 PetrovKP

/intelci: run

PetrovKP avatar Oct 27 '20 21:10 PetrovKP

not relevant.

PetrovKP avatar Nov 01 '20 16:11 PetrovKP

@Mergifyio rebase

PetrovKP avatar Mar 01 '21 22:03 PetrovKP

Command rebase: failure

Branch rebase failed Git reported the following error:

First, rewinding head to replay your work on top of it...
Applying: test compressiom
.git/rebase-apply/patch:7731: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	cpp/daal/include/daal.h
M	cpp/daal/include/daal_win.h
M	cpp/daal/include/data_management/compression/bzip2compression.h
M	cpp/daal/include/data_management/compression/compression.h
M	cpp/daal/include/data_management/compression/compression_stream.h
M	cpp/daal/include/data_management/compression/lzocompression.h
M	cpp/daal/include/data_management/compression/rlecompression.h
M	cpp/daal/include/data_management/compression/zlibcompression.h
M	cpp/daal/include/data_management/data/data_archive.h
M	cpp/daal/src/services/compression/bzip2compression.cpp
M	cpp/daal/src/services/compression/compression_stream.cpp
M	cpp/daal/src/services/compression/lzocompression.cpp
M	cpp/daal/src/services/compression/rlecompression.cpp
M	cpp/daal/src/services/compression/zlibcompression.cpp
M	cpp/daal/src/threading/export_lnx32e.def
M	cpp/daal/src/threading/export_mac.def
M	examples/daal/cpp/source/compression/compression_batch.cpp
M	examples/daal/cpp/source/compression/compression_online.cpp
M	examples/daal/cpp/source/compression/compressor.cpp
M	examples/daal/java/com/intel/daal/examples/compression/CompressionBatch.java
M	examples/daal/java/com/intel/daal/examples/compression/CompressionOnline.java
M	examples/daal/java/com/intel/daal/examples/compression/CompressorExample.java
M	examples/daal/java/daal.lst.bat
M	examples/daal/java/daal_fbsd.lst
M	examples/daal/java/daal_lnx.lst
M	examples/daal/java/daal_mac.lst
M	java/com/intel/daal/data_management/compression/Compression.java
M	java/com/intel/daal/data_management/compression/CompressionLevel.java
M	java/com/intel/daal/data_management/compression/CompressionMethod.java
M	java/com/intel/daal/data_management/compression/CompressionParameter.java
M	java/com/intel/daal/data_management/compression/CompressionStream.java
M	java/com/intel/daal/data_management/compression/Compressor.java
M	java/com/intel/daal/data_management/compression/DecompressionStream.java
M	java/com/intel/daal/data_management/compression/Decompressor.java
M	java/com/intel/daal/data_management/compression/bzip2/Bzip2CompressionParameter.java
M	java/com/intel/daal/data_management/compression/bzip2/Bzip2Compressor.java
M	java/com/intel/daal/data_management/compression/bzip2/Bzip2Decompressor.java
M	java/com/intel/daal/data_management/compression/compression.cpp
M	java/com/intel/daal/data_management/compression/compression_parameter.cpp
M	java/com/intel/daal/data_management/compression/compression_stream.cpp
M	java/com/intel/daal/data_management/compression/compression_types.i
M	java/com/intel/daal/data_management/compression/compressor.cpp
M	java/com/intel/daal/data_management/compression/decompression_stream.cpp
M	java/com/intel/daal/data_management/compression/decompressor.cpp
M	java/com/intel/daal/data_management/compression/lzo/LzoCompressionParameter.java
M	java/com/intel/daal/data_management/compression/lzo/LzoCompressor.java
M	java/com/intel/daal/data_management/compression/lzo/LzoDecompressor.java
M	java/com/intel/daal/data_management/compression/lzo_parameter.cpp
M	java/com/intel/daal/data_management/compression/rle/RleCompressionParameter.java
M	java/com/intel/daal/data_management/compression/rle/RleCompressor.java
M	java/com/intel/daal/data_management/compression/rle/RleDecompressor.java
M	java/com/intel/daal/data_management/compression/rle_parameter.cpp
M	java/com/intel/daal/data_management/compression/zlib/ZlibCompressionParameter.java
M	java/com/intel/daal/data_management/compression/zlib/ZlibCompressor.java
M	java/com/intel/daal/data_management/compression/zlib/ZlibDecompressor.java
M	java/com/intel/daal/data_management/compression/zlib_parameter.cpp
M	makefile.lst
Falling back to patching base and 3-way merge...
Auto-merging makefile.lst
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/zlib_parameter.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/zlib_parameter.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/zlib/ZlibDecompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/zlib/ZlibDecompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/zlib/ZlibCompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/zlib/ZlibCompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/zlib/ZlibCompressionParameter.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/zlib/ZlibCompressionParameter.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/rle_parameter.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/rle_parameter.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/rle/RleDecompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/rle/RleDecompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/rle/RleCompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/rle/RleCompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/rle/RleCompressionParameter.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/rle/RleCompressionParameter.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/lzo_parameter.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/lzo_parameter.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/lzo/LzoDecompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/lzo/LzoDecompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/lzo/LzoCompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/lzo/LzoCompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/lzo/LzoCompressionParameter.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/lzo/LzoCompressionParameter.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/decompressor.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/decompressor.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/decompression_stream.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/decompression_stream.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/compressor.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/compressor.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/compression_types.i deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/compression_types.i left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/compression_stream.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/compression_stream.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/compression_parameter.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/compression_parameter.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/compression.cpp deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/compression.cpp left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/bzip2/Bzip2Decompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/bzip2/Bzip2Decompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/bzip2/Bzip2Compressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/bzip2/Bzip2Compressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/bzip2/Bzip2CompressionParameter.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/bzip2/Bzip2CompressionParameter.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/Decompressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/Decompressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/DecompressionStream.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/DecompressionStream.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/Compressor.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/Compressor.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/CompressionStream.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/CompressionStream.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/CompressionParameter.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/CompressionParameter.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/CompressionMethod.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/CompressionMethod.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/CompressionLevel.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/CompressionLevel.java left in tree.
CONFLICT (modify/delete): java/com/intel/daal/data_management/compression/Compression.java deleted in test compressiom and modified in HEAD. Version HEAD of java/com/intel/daal/data_management/compression/Compression.java left in tree.
Auto-merging examples/daal/java/daal_mac.lst
Auto-merging examples/daal/java/daal_lnx.lst
Auto-merging examples/daal/java/daal_fbsd.lst
Auto-merging examples/daal/java/daal.lst.bat
CONFLICT (modify/delete): examples/daal/java/com/intel/daal/examples/compression/CompressorExample.java deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/java/com/intel/daal/examples/compression/CompressorExample.java left in tree.
CONFLICT (modify/delete): examples/daal/java/com/intel/daal/examples/compression/CompressionOnline.java deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/java/com/intel/daal/examples/compression/CompressionOnline.java left in tree.
CONFLICT (modify/delete): examples/daal/java/com/intel/daal/examples/compression/CompressionBatch.java deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/java/com/intel/daal/examples/compression/CompressionBatch.java left in tree.
CONFLICT (modify/delete): examples/daal/cpp/source/compression/compressor.cpp deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/cpp/source/compression/compressor.cpp left in tree.
CONFLICT (modify/delete): examples/daal/cpp/source/compression/compression_online.cpp deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/cpp/source/compression/compression_online.cpp left in tree.
CONFLICT (modify/delete): examples/daal/cpp/source/compression/compression_batch.cpp deleted in test compressiom and modified in HEAD. Version HEAD of examples/daal/cpp/source/compression/compression_batch.cpp left in tree.
Auto-merging cpp/daal/src/threading/export_mac.def
Auto-merging cpp/daal/src/threading/export_lnx32e.def
CONFLICT (modify/delete): cpp/daal/src/services/compression/zlibcompression.cpp deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/src/services/compression/zlibcompression.cpp left in tree.
CONFLICT (modify/delete): cpp/daal/src/services/compression/rlecompression.cpp deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/src/services/compression/rlecompression.cpp left in tree.
CONFLICT (modify/delete): cpp/daal/src/services/compression/lzocompression.cpp deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/src/services/compression/lzocompression.cpp left in tree.
CONFLICT (modify/delete): cpp/daal/src/services/compression/compression_stream.cpp deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/src/services/compression/compression_stream.cpp left in tree.
CONFLICT (modify/delete): cpp/daal/src/services/compression/bzip2compression.cpp deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/src/services/compression/bzip2compression.cpp left in tree.
Auto-merging cpp/daal/include/data_management/data/data_archive.h
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/zlibcompression.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/zlibcompression.h left in tree.
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/rlecompression.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/rlecompression.h left in tree.
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/lzocompression.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/lzocompression.h left in tree.
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/compression_stream.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/compression_stream.h left in tree.
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/compression.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/compression.h left in tree.
CONFLICT (modify/delete): cpp/daal/include/data_management/compression/bzip2compression.h deleted in test compressiom and modified in HEAD. Version HEAD of cpp/daal/include/data_management/compression/bzip2compression.h left in tree.
Auto-merging cpp/daal/include/daal_win.h
Auto-merging cpp/daal/include/daal.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 test compressiom
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 361D6

mergify[bot] avatar Mar 01 '21 22:03 mergify[bot]

@napetrov - is it already in our library in some form?

KulikovNikita avatar Mar 21 '23 12:03 KulikovNikita

@KulikovNikita @Alexsandruss - this is what we would like to cleanup.

But first this need to be marked as deprecated from 2023.2 release

napetrov avatar Mar 21 '23 14:03 napetrov

rebase

❌ Unable to rebase: user PetrovKP is unknown.

Please make sure PetrovKP has logged in Mergify dashboard.

mergify[bot] avatar Mar 26 '23 00:03 mergify[bot]