Linux build

.github/workflows/linux_x64.yml

@@ -0,0 +1,42 @@
+name: linux-x64
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  linux-x64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y llvm-19 clang-format python3 python3-venv ninja-build
+      - name: Check installed clang
+        run: |
+          which clang++ && clang++ -v
+      - name: Prepare
+        run: |
+          source $GITHUB_WORKSPACE/scripts/prepare_linux_x64.sh
+          echo PATH=${GITHUB_WORKSPACE}/.venv/bin:$PATH >> $GITHUB_ENV
+      - name: Check virtual environment
+        run: |
+          which clang++ && clang++ -v
+          which python3 && python3 -V
+          which conan && conan -v
+          which cmake && cmake --version
+      - name: Configure
+        run: |
+          cmake --preset 'conan-debug'
+      - name: Build
+        run: |
+          make -j$(nproc) -C $GITHUB_WORKSPACE/build/Debug/
+      - name: Run tests
+        run: |
+          make -j$(nproc) test -C $GITHUB_WORKSPACE/build/Debug/

.github/workflows/macos_arm.yml

@@ -0,0 +1,46 @@
+name: macos-arm
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  macos-arm64:
+    runs-on: macos-15
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install LLVM
+        run: |
+          brew install llvm@19
+          brew link --force llvm@19
+          echo 'export PATH="/opt/homebrew/opt/llvm@19/bin:$PATH"' >> /Users/runner/.bash_profile
+          source /Users/runner/.bash_profile
+      - name: Check installed clang
+        run: |
+          which clang++ && clang++ -v
+          /opt/homebrew/opt/llvm@19/bin/clang++ -v
+      - name: Prepare
+        run: |
+          source $GITHUB_WORKSPACE/scripts/prepare_macos_arm.sh
+          echo PATH=${GITHUB_WORKSPACE}/.venv/bin:$PATH >> $GITHUB_ENV
+      - name: Check virtual environment
+        run: |
+          which clang++ && clang++ -v
+          which /opt/homebrew/opt/llvm@19/bin/clang++ && /opt/homebrew/opt/llvm@19/bin/clang++ -v
+          which python3 && python3 -V
+          which conan && conan -v
+          which cmake && cmake --version
+      - name: Configure
+        run: |
+          cmake --preset 'conan-debug'
+      - name: Build
+        run: |
+          make -j$(sysctl -n hw.ncpu) -C $GITHUB_WORKSPACE/build/Debug/
+      - name: Run tests
+        run: |
+          make -j$(sysctl -n hw.ncpu) test -C $GITHUB_WORKSPACE/build/Debug/

.github/workflows/macos.yml → .github/workflows/macos_x64.yml

@@ -1,4 +1,4 @@
-name: macos
+name: macos-x64
 
 on:
   push:
@@ -26,12 +26,12 @@ jobs:
           /usr/local/bin/clang++ -v
       - name: Prepare
         run: |
-          source $GITHUB_WORKSPACE/scripts/prepare_macos_x64_debug.sh
+          source $GITHUB_WORKSPACE/scripts/prepare_macos_x64.sh
           echo PATH=${GITHUB_WORKSPACE}/.venv/bin:$PATH >> $GITHUB_ENV
       - name: Check virtual environment
         run: |
           which clang++ && clang++ -v
-          which /usr/local/opt/llvm/bin/clang++ && /usr/local/opt/llvm/bin/clang++ -v
+          which /usr/local/bin/clang++ && /usr/local/bin/clang++ -v
           which python3 && python3 -V
           which conan && conan -v
           which cmake && cmake --version
@@ -40,7 +40,7 @@ jobs:
           cmake --preset 'conan-debug'
       - name: Build
         run: |
-          ninja -j$(sysctl -n hw.ncpu) -C $GITHUB_WORKSPACE/build/Debug/
+          make -j$(sysctl -n hw.ncpu) -C $GITHUB_WORKSPACE/build/Debug/
       - name: Run tests
         run: |
-          ninja -j$(sysctl -n hw.ncpu) test -C $GITHUB_WORKSPACE/build/Debug/
+          make -j$(sysctl -n hw.ncpu) test -C $GITHUB_WORKSPACE/build/Debug/

.gitignore

@@ -1,4 +1,5 @@
 build/
 .venv/
 CMakeUserPresets.json
-.DS_Store
+.DS_Store
+cmake

CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.23)
 
 project(liblena)
 project(liblena_tests)
-project(liblena_JPEG)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -62,23 +61,4 @@ target_link_libraries(liblena_tests
 target_compile_definitions(liblena_tests PRIVATE
     RESOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/TestsData"
 )
-gtest_discover_tests(liblena_tests)
-
-# JPEG
-add_executable(liblena_JPEG
-    ${CMAKE_CURRENT_SOURCE_DIR}/Examples/JPEG.cpp
-)
-target_include_directories(liblena_JPEG PUBLIC
-${CMAKE_CURRENT_SOURCE_DIR}/
-    ${CMAKE_CURRENT_SOURCE_DIR}/Input
-    ${CMAKE_CURRENT_SOURCE_DIR}/Types
-    ${CMAKE_CURRENT_SOURCE_DIR}/Utils
-    ${CMAKE_CURRENT_SOURCE_DIR}/JPEG
-    ${CMAKE_CURRENT_SOURCE_DIR}/Visualization
-)
-target_compile_definitions(liblena_JPEG PRIVATE
-    RESOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}/TestsData"
-)
-target_link_libraries(liblena_JPEG
-    liblena
-)
+gtest_discover_tests(liblena_tests)

README.md

@@ -10,7 +10,9 @@ for experiments with data compression techniques
 <h3>
 </h3>
 
-[![macos](https://github.com/andarut/liblena/actions/workflows/macos.yml/badge.svg?branch=main&event=push)](https://github.com/andarut/liblena/actions/workflows/macos.yml)
+[![macos-x64](https://github.com/andarut/liblena/actions/workflows/macos_x64.yml/badge.svg?branch=main&event=push)](https://github.com/andarut/liblena/actions/workflows/macos_x64.yml)
+[![macos-arm](https://github.com/andarut/liblena/actions/workflows/macos_arm.yml/badge.svg?branch=main&event=push)](https://github.com/andarut/liblena/actions/workflows/macos_arm.yml)
+[![linux-x64](https://github.com/andarut/liblena/actions/workflows/linux_x64.yml/badge.svg?branch=main&event=push)](https://github.com/andarut/liblena/actions/workflows/linux_x64.yml)
 
 </div>
 
@@ -124,51 +126,50 @@ Run script for your system to **first time** building `<BUILD_TYPE>` version of
 source ./scripts/prepare_<OS>_<ARCH>_<BUILD_TYPE>.sh
 ```
 
-Example:
+ExampleS:
 ```
-source ./scripts/prepare_macos_x64_debug.sh
+source ./scripts/prepare_macos_x64.sh
+```
+```
+source ./scripts/prepare_macos_arm.sh
+```
+```
+source ./scripts/prepare_linux_x64.sh
 ```
 
 This script will install dependencies and link installed `cmake` into `.venv/bin/cmake`.
 
 ## Configure
 FIRST SEE [Requirements](Requirements) !
 
-From now on you can build with **cmake configs**. `conan-debug` or `conan-release` depending on your build type.
+From now on you can build with **cmake configs**. Main is `conan-debug`.
 
 ```
 cmake --preset 'conan-debug'
 ```
-or
-```
-cmake --preset 'conan-release'
-```
 
 ## Build
 ```
-ninja -j$(nproc) -C build/Debug
-```
-or
-```
-ninja -j$(nproc) -C build/Release
+make -j$(nproc) -C build/Debug
 ```
 
 On macos you can use `sysctl -n hw.ncpu` instead of `nproc`. `nproc` can be installed with `brew install coreutils`. 
 ```
-ninja -j$(sysctl -n hw.ncpu) -C build/Debug
+make -j$(sysctl -n hw.ncpu) -C build/Debug
 ```
 or
 ```
-ninja -j$(sysctl -n hw.ncpu) -C build/Release
+make -j$(sysctl -n hw.ncpu) -C build/Release
 ```
 
-## Run tests
-Only in **debug** build:
+## Run tests (this may a while)
 ```
-ninja test -j$(nproc) -C build/Debug
+make test -j$(nproc) -C build/Debug
 ```
 
-## Goal for v1.0
-Working JPEG (encoder and decoder)
+## Run test with visualization (this may a while)
+```
+./build/Debug/liblena_tests
+```
 
 ## Releases

Tests/JPEG.cpp

@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include <filesystem>
 
 #include "lena.hpp"
 
@@ -23,8 +24,8 @@ BitStream JPEG(const std::vector<ImageChannel<u8>>& RGB_data) {
     auto YCbCr_data = RGB2YCbCr(RGB_data);
 
     /* Downsampling */
-    auto Cb_downsampled = enc::downsampling(YCbCr_data[1], {4, 1, 1});
-    auto Cr_downsampled = enc::downsampling(YCbCr_data[2], {4, 1, 1});
+    auto Cb_downsampled = enc::downsampling(YCbCr_data[1], {4, 2, 2});
+    auto Cr_downsampled = enc::downsampling(YCbCr_data[2], {4, 2, 2});
 
     /* MCUs */
     auto Y_MCUs  = enc::MCUs(YCbCr_data[0], {8, 8});
@@ -89,8 +90,8 @@ std::vector<ImageChannel<u8>> JPEG(BitStream& bs) {
     auto Cr = dec::MCUs(Cr_IDCT_MCUs, {8, 8}, width, height);
 
     /* Resample */
-    auto Cb_resampled = dec::downsampling<u8>(Cb, {4, 1, 1}, width, height);
-    auto Cr_resampled = dec::downsampling<u8>(Cr, {4, 1, 1}, width, height);
+    auto Cb_resampled = dec::downsampling<u8>(Cb, {4, 2, 2}, width, height);
+    auto Cr_resampled = dec::downsampling<u8>(Cr, {4, 2, 2}, width, height);
 
     /* Color Transform */
     auto RGB_data = YCbCr2RGB({Y, Cb_resampled, Cr_resampled});

TestsData/libjpeg.py

@@ -6,7 +6,7 @@
 Q = 50
 
 def encode(input_path: str, encoded_path: str):
-    encode_cmd = f"cjpeg -quality {Q} -baseline -dct float -sample 4x1,1x1,1x1  {input_path} > {encoded_path}"
+    encode_cmd = f"cjpeg -quality {Q} -baseline -dct float -sample 2x1,1x1,1x1  {input_path} > {encoded_path}"
     print(f"ENCODE {encode_cmd}")
     os.system(encode_cmd)
 

Utils/Logger.hpp

@@ -4,6 +4,7 @@
 
 #include <cstdio>
 #include <utility>
+#include <cstdarg>
 
 // #define TRUEDEBUG
 

Utils/Timer.hpp

@@ -3,21 +3,25 @@
 
 #include "Utils.hpp"
 
-struct Timer {
-    u64 duration;
-    std::chrono::steady_clock::time_point time_point;
+#include <chrono>
+#include <cstdint>
+using u64 = std::uint64_t;
 
-    Timer() = default;
+struct Timer {
+    u64 duration = 0;
+    std::chrono::high_resolution_clock::time_point time_point;
 
     void start() {
         time_point = std::chrono::high_resolution_clock::now();
     }
 
     void end() {
         auto now = std::chrono::high_resolution_clock::now();
-        duration =  std::chrono::duration_cast<std::chrono::milliseconds>(now - time_point).count();
+        duration = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       now - time_point
+                   ).count();
     }
-
 };
 
+
 #endif // TIMER_H

visualization/Visualization.hpp → Visualization.hpp

@@ -112,7 +112,7 @@ class Visualization {
 
 		int scale = 1;
 
-		printf("show %lld x %lld\n", chs[0].width(), chs[0].height());
+		printf("show %lu x %lu\n", chs[0].width(), chs[0].height());
 
 		/* Init window */
 		GLFWwindow* window = glfwCreateWindow(

conanfile.py

@@ -17,7 +17,7 @@ def build_requirements(self):
 		self.test_requires("stb/cci.20240531")
 
 	def generate(self):
-		tc = CMakeToolchain(self, generator="Ninja")
+		tc = CMakeToolchain(self, generator="Unix Makefiles")
 		if self.settings.build_type == "Debug":
 			tc.variables["CMAKE_C_FLAGS"] = "-fsanitize=address,undefined -fno-omit-frame-pointer"
 			tc.variables["CMAKE_CXX_FLAGS"] = "-fsanitize=address,undefined -fno-omit-frame-pointer"

profiles/linux_x64

@@ -0,0 +1,16 @@
+[settings]
+arch=x86_64
+build_type=Debug
+compiler=clang
+compiler.cppstd=gnu17
+compiler.libcxx=libstdc++
+compiler.version=16
+os=Linux
+
+[buildenv]
+CC=/usr/bin/clang
+CXX=/usr/bin/clang++
+
+[conf]
+tools.system.package_manager:mode = install
+tools.system.package_manager:sudo = True

profiles/mac_x64_release → profiles/mac_arm

@@ -1,12 +1,12 @@
 [settings]
-arch=x86_64
-build_type=Release
+arch=armv8
+build_type=Debug
 compiler=clang
 compiler.cppstd=gnu17
 compiler.libcxx=libc++
 compiler.version=16
 os=Macos
 
 [buildenv]
-CC=/usr/local/bin/clang
-CXX=/usr/local/bin/clang++
+CC=/opt/homebrew/opt/llvm@19/bin/clang
+CXX=/opt/homebrew/opt/llvm@19/bin/clang++

scripts/prepare_macos_x64_debug.sh → scripts/prepare_linux_x64.sh

@@ -6,13 +6,13 @@ fi
 
 ROOT_DIR="${SCRIPT_DIR}/.."
 PROFILES_DIR="${ROOT_DIR}/profiles"
-PROFILE_PATH="${PROFILES_DIR}/mac_x64_debug"
+PROFILE_PATH="${PROFILES_DIR}/linux_x64"
 
 VENV_DIR="${ROOT_DIR}/.venv"
 VENV_BIN_DIR="${VENV_DIR}/bin"
 
 # Create venv and install conan
-source ${SCRIPT_DIR}/macos/install_conan.sh
+source ${SCRIPT_DIR}/install_conan.sh
 
 # Activate venv
 source ${ROOT_DIR}/.venv/bin/activate