-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from Orange-OpenSource/pre-release-3.4
Cool-chic 3.4: 30% less complex!
- Loading branch information
Showing
575 changed files
with
5,026 additions
and
2,842 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| arm = 24,2 | ||
| layers_synthesis = 40-1-linear-relu,3-1-linear-none,3-3-residual-relu,3-3-residual-none | ||
| arm = 16,2 | ||
| layers_synthesis = 48-1-linear-relu,X-1-linear-none,X-3-residual-relu,X-3-residual-none | ||
| n_ft_per_res = 1,1,1,1,1,1,1 | ||
| upsampling_kernel_size = 8 | ||
| static_upsampling_kernel = False | ||
|
|
||
| ups_k_size = 8 | ||
| ups_preconcat_k_size = 7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| arm = 8,2 | ||
| layers_synthesis = 16-1-linear-relu,3-1-linear-none,3-3-residual-relu,3-3-residual-none | ||
| layers_synthesis = 16-1-linear-relu,X-1-linear-none,X-3-residual-relu,X-3-residual-none | ||
| n_ft_per_res = 1,1,1,1,1,1,1 | ||
| upsampling_kernel_size = 4 | ||
| static_upsampling_kernel = False | ||
| ups_k_size = 8 | ||
| ups_preconcat_k_size = 7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| arm = 16,2 | ||
| layers_synthesis = 16-1-linear-relu,3-1-linear-none,3-3-residual-relu,3-3-residual-none | ||
| layers_synthesis = 16-1-linear-relu,X-1-linear-none,X-3-residual-relu,X-3-residual-none | ||
| n_ft_per_res = 1,1,1,1,1,1,1 | ||
| upsampling_kernel_size = 4 | ||
| static_upsampling_kernel = False | ||
| ups_k_size = 8 | ||
| ups_preconcat_k_size = 7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| arm = 8,1 | ||
| layers_synthesis = 8-1-linear-relu,3-1-linear-none,3-3-residual-none | ||
| layers_synthesis = 8-1-linear-relu,X-1-linear-none,X-3-residual-none | ||
| n_ft_per_res = 1,1,1,1,1,1,1 | ||
| upsampling_kernel_size = 4 | ||
| static_upsampling_kernel = False | ||
| ups_k_size = 8 | ||
| ups_preconcat_k_size = 7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
|
|
||
| add_executable(ccdec) | ||
|
|
||
| set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}) | ||
|
|
||
| if(WIN32) | ||
|
|
||
| message(STATUS "[ERROR] Cool-chic decoder not yet implemented for Windows...") | ||
|
|
||
| # Check Apple first, then UNIX (Apple + Linux) so that if we enter the UNIX if | ||
| # it means that we're on Linux. | ||
| elseif(APPLE) | ||
|
|
||
| if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") | ||
|
|
||
| # Changes when compiling for arm64 Apple Mac: | ||
| # - Remove all *_avx2.cpp and *_avx512.cpp files | ||
| # - Remove the -mfa from the compilation options | ||
| # - Remove all the target_link_options... what is this for?? | ||
| # | ||
| # It only compiles using g++/gcc, not clang which defaults to | ||
| # an older version apparently? | ||
| # cmake -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-13 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-13 .. | ||
|
|
||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -g -Wall -Winline") | ||
|
|
||
| target_sources(ccdec PRIVATE ccdecapi.cpp cc-bitstream.cpp cc-contexts.cpp arm_cpu.cpp syn_cpu.cpp BitStream.cpp TDecBinCoderCABAC.cpp Contexts.cpp) | ||
|
|
||
| else() | ||
|
|
||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -g -mfma -Winline") | ||
|
|
||
| # For now, we compile *_avx2.cpp and files, but they are | ||
| # excluded from ccdec.cpp using quick & dirty #ifdef __APPLE__ | ||
| target_sources(ccdec PRIVATE ccdecapi.cpp cc-bitstream.cpp cc-contexts.cpp arm_cpu.cpp arm_avx2.cpp ups_cpu.cpp ups_avx2.cpp syn_cpu.cpp syn_avx2.cpp BitStream.cpp TDecBinCoderCABAC.cpp Contexts.cpp) | ||
|
|
||
| set_source_files_properties(arm_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
| set_source_files_properties(ups_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
| set_source_files_properties(syn_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
|
|
||
| endif() | ||
|
|
||
| elseif(UNIX) | ||
|
|
||
| message(STATUS "Architecture: Linux") | ||
|
|
||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -g -mfma -Wall -Winline -DCCDEC_EXE -DCCDECAPI_AVX2_OPTIONAL") | ||
|
|
||
| target_sources(ccdec PRIVATE ccdecapi.cpp cc-bitstream.cpp cc-contexts.cpp cc-frame-decoder.cpp frame-memory.cpp arm_cpu.cpp arm_avx2.cpp ups_cpu.cpp ups_avx2.cpp syn_cpu.cpp syn_avx2.cpp BitStream.cpp TDecBinCoderCABAC.cpp Contexts.cpp) | ||
| set(CMAKE_EXE_LINKER_FLAGS "-static") | ||
|
|
||
| set_source_files_properties(arm_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
| set_source_files_properties(ups_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
| set_source_files_properties(syn_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2") | ||
|
|
||
| endif() | ||
|
|
Oops, something went wrong.