diff --git a/Files b/Files index 4dbe28c5..ae781d4d 100644 --- a/Files +++ b/Files @@ -1,9 +1,8 @@ . -├── adwaita-qt +├── archlinux-keyring +│   ├── archlinux-keyring.install │   └── PKGBUILD ├── asp.sh -├── awesome-luajit -│   └── PKGBUILD ├── bash │   ├── bash52-001 │   ├── bash52-002 @@ -31,6 +30,24 @@ │   ├── bash52-024 │   ├── bash52-025 │   ├── bash52-026 +│   ├── bash52-027 +│   ├── bash52-028 +│   ├── bash52-029 +│   ├── bash52-030 +│   ├── bash52-031 +│   ├── bash52-032 +│   ├── bash52-033 +│   ├── bash52-034 +│   ├── bash52-035 +│   ├── bash52-036 +│   ├── bash52-037 +│   ├── bash-5.2_p15-configure-clang16.patch +│   ├── bash-5.2_p15-random-ub.patch +│   ├── bash-5.2_p21-configure-strtold.patch +│   ├── bash-5.2_p21-wpointer-to-int.patch +│   ├── bash-5.2_p26-memory-leaks.patch +│   ├── bash-5.2_p32-memory-leaks.patch +│   ├── bash-5.2_p32-read-delimiter-in-invalid-mbchar.patch │   ├── bash.install │   ├── dot.bash_logout │   ├── dot.bash_profile @@ -44,34 +61,25 @@ ├── cachy-browser │   ├── cachy-browser.desktop │   ├── cachy-browser.install +│   ├── line-breakers-fix.patch │   ├── match.patch +│   ├── PKGBUILD +│   └── wasi-sysroot-path.patch +├── cachy-chroot │   └── PKGBUILD ├── cachyos-ananicy-rules │   └── PKGBUILD -├── cachyos-armcord +├── cachyos-benchmarker │   └── PKGBUILD ├── cachyos-calamares -│   ├── 79db04dc2eb00b354044f73c054a94fe2b9f9aae.patch │   └── PKGBUILD ├── cachyos-cli-installer-new │   └── PKGBUILD -├── cachyos-dwl-config -│   ├── config.h -│   └── PKGBUILD -├── cachyos-dwm-config -│   ├── config.h -│   ├── dwm-colorbar-6.2.diff -│   ├── dwm-cyclelayouts-20220327-6.3.diff -│   ├── dwm.desktop -│   ├── dwm.install -│   ├── dwm-vanitygaps-6.3.diff -│   ├── dwm-xrdb-6.2.diff -│   └── PKGBUILD -├── cachyos-emerald-kde -│   └── PKGBUILD ├── cachyos-fish-config │   ├── cachyos-fish-config.install │   └── PKGBUILD +├── cachyos-gaming-applications +│   └── PKGBUILD ├── cachyos-gaming-meta │   └── PKGBUILD ├── cachyos-gnome-settings @@ -81,8 +89,7 @@ │   ├── cachyos-grub-theme.install │   └── PKGBUILD ├── cachyos-hello -│   ├── PKGBUILD -│   └── revert-alpm.patch +│   └── PKGBUILD ├── cachyos-hello-git │   └── PKGBUILD ├── cachyos-hooks @@ -92,24 +99,23 @@ ├── cachyos-i3wm-settings │   ├── cachyos-i3wm-settings.install │   └── PKGBUILD -├── cachyos-iridescent-kde -│   └── PKGBUILD ├── cachyos-kde-settings │   ├── cachyos-kde-settings.install │   └── PKGBUILD +├── cachyos-kdump-tools +│   ├── cachyos-kdump-tools.install +│   └── PKGBUILD ├── cachyos-kernel-manager │   ├── fix-installed-db.patch │   └── PKGBUILD ├── cachyos-kernel-manager-git +│   ├── fix-installed-db.patch │   └── PKGBUILD ├── cachyos-keyring │   ├── cachyos.gpg │   ├── cachyos-keyring.install -│   └── PKGBUILD -├── cachyos-kofuku -│   ├── cachyos-kofuku.install -│   └── PKGBUILD -├── cachyos-lavender-kde +│   ├── cachyos-revoked +│   ├── cachyos-trusted │   └── PKGBUILD ├── cachyos-mirrorlist │   ├── cachyos-mirrorlist @@ -140,12 +146,17 @@ ├── cachyos-settings │   ├── cachyos-settings.install │   └── PKGBUILD -├── cachyos-st-config -│   └── PKGBUILD +├── cachyos-snapper-support +│   ├── cachyos-snapper-support.install +│   ├── PKGBUILD +│   └── snapper-template-root-cachyos ├── cachyos-sysctl-manager │   └── PKGBUILD ├── cachyos-sysctl-manager-git │   └── PKGBUILD +├── cachyos-themes-sddm +│   ├── cachyos-themes-sddm.install +│   └── PKGBUILD ├── cachyos-v3-mirrorlist │   ├── cachyos-v3-mirrorlist │   └── PKGBUILD @@ -166,10 +177,78 @@ │   └── PKGBUILD ├── chwd │   └── PKGBUILD -├── dash -│   ├── dash.install -│   ├── PKGBUILD -│   └── workload.dash +├── clang +│   ├── 0001-Enable-TuningSlowDivide64-on-Barcelona-Bobcat-Bulldo.patch +│   ├── 0002-Reduce-znver3-4-LoopMicroOpBufferSize-to-practical-l.patch +│   ├── clangd-handle-missing-ending-brace.patch +│   ├── clang-disable-float128-diagnostics-for-device-compilation.patch +│   ├── enable-fstack-protector-strong-by-default.patch +│   └── PKGBUILD +├── cosmic +│   ├── build-order.txt +│   ├── cosmic-applets +│   │   └── PKGBUILD +│   ├── cosmic-app-library +│   │   └── PKGBUILD +│   ├── cosmic-bg +│   │   └── PKGBUILD +│   ├── cosmic-comp +│   │   └── PKGBUILD +│   ├── cosmic-files +│   │   └── PKGBUILD +│   ├── cosmic-greeter +│   │   ├── cosmic-greeter-display-manager.patch +│   │   ├── cosmic-greeter-lto.patch +│   │   └── PKGBUILD +│   ├── cosmic-icon-theme +│   │   └── PKGBUILD +│   ├── cosmic-launcher +│   │   └── PKGBUILD +│   ├── cosmic-notifications +│   │   └── PKGBUILD +│   ├── cosmic-osd +│   │   └── PKGBUILD +│   ├── cosmic-panel +│   │   └── PKGBUILD +│   ├── cosmic-randr +│   │   └── PKGBUILD +│   ├── cosmic-screenshot +│   │   └── PKGBUILD +│   ├── cosmic-session +│   │   └── PKGBUILD +│   ├── cosmic-settings +│   │   └── PKGBUILD +│   ├── cosmic-settings-daemon +│   │   └── PKGBUILD +│   ├── cosmic-store +│   │   └── PKGBUILD +│   ├── cosmic-terminal +│   │   └── PKGBUILD +│   ├── cosmic-text-editor +│   │   └── PKGBUILD +│   ├── cosmic-wallpapers +│   │   └── PKGBUILD +│   ├── cosmic-workspaces +│   │   └── PKGBUILD +│   ├── generate-srcinfo.sh +│   ├── pop-icon-theme +│   │   └── PKGBUILD +│   ├── pop-launcher +│   │   ├── PKGBUILD +│   │   └── pop-launcher-symlinks.patch +│   ├── pop-sound-theme-git +│   │   └── PKGBUILD +│   └── xdg-desktop-portal-cosmic +│   ├── PKGBUILD +│   └── xdg-desktop-portal-cosmic-lto.patch +├── crash +│   ├── fix-crash.patch +│   └── PKGBUILD +├── ddcutil +│   └── PKGBUILD +├── devtools +│   ├── 9fc61fc4325cfe36dc86353137eb38041c79275f.patch +│   └── PKGBUILD ├── dkms │   ├── dkms.install │   ├── hook.install @@ -177,88 +256,237 @@ │   ├── hook.sh │   ├── hook.upgrade │   └── PKGBUILD -├── dracut +├── dracut-cachyos │   ├── 60-dracut-remove.hook │   ├── 90-dracut-install.hook │   ├── dracut-cachyos.conf │   ├── dracut-install │   ├── dracut-rebuild │   ├── dracut-remove -│   ├── dracut-systemd-255-pcrphase.patch │   ├── module-setup.sh │   ├── PKGBUILD │   └── snapshot-overlay.sh ├── Files -├── hyprland-git -│   ├── PKGBUILD -│   └── runtime-xwayland-disable.patch -├── julia -│   ├── c12e8515.patch -│   ├── julia-hardcoded-libs.patch -│   ├── julia-libcholmod-cuda.patch -│   ├── julia-libgit2-1.7.patch -│   ├── julia-libunwind-1.6.patch -│   ├── julia-suitesparse-7.patch +├── go │   └── PKGBUILD +├── grub-btrfs-support +│   ├── grub-btrfs-snapper.path +│   ├── grub-btrfs-snapper.service +│   ├── grub-btrfs-support.install +│   └── PKGBUILD +├── handheld +│   ├── cachyos-handheld +│   │   ├── cachyos-handheld.install +│   │   └── PKGBUILD +│   ├── cachyos-vapor +│   │   └── PKGBUILD +│   ├── gamescope-session-steam-git +│   │   ├── PKGBUILD +│   │   └── steam-exports.patch +│   ├── jupiter-fan-control +│   │   └── PKGBUILD +│   ├── jupiter-hw-support +│   │   ├── cachyos-automount.patch +│   │   ├── PKGBUILD +│   │   ├── priv-write.patch +│   │   ├── pythonhid.patch +│   │   ├── steamos-btrfs-automount.patch +│   │   └── udev-automount-rules.patch +│   ├── powerbuttond +│   │   └── PKGBUILD +│   ├── rogue-enemy +│   │   ├── PKGBUILD +│   │   ├── rogue-enemy.service +│   │   └── stray-ally.service +│   ├── steam +│   │   ├── fix-downloadspeed.patch +│   │   ├── PKGBUILD +│   │   ├── steam_1.0.0.81.dsc +│   │   └── steam-runtime.sh +│   ├── steamdeck-dsp +│   │   └── PKGBUILD +│   └── unused +│   ├── gamescope +│   │   ├── chimera.patch +│   │   └── PKGBUILD +│   ├── gamescope-plus +│   │   ├── 0001-explicit-sync.patch +│   │   └── PKGBUILD +│   └── gamescope-session-git +│   ├── deck-quirks.patch +│   ├── force-wsi.patch +│   ├── gamescope-session.install +│   ├── PKGBUILD +│   └── powerbuttond.patch +├── java +│   ├── java17-openjdk +│   │   ├── freedesktop-java.desktop +│   │   ├── freedesktop-jconsole.desktop +│   │   ├── freedesktop-jshell.desktop +│   │   ├── install_jdk-openjdk.sh +│   │   ├── install_jre-openjdk-headless.sh +│   │   ├── install_jre-openjdk.sh +│   │   └── PKGBUILD +│   └── java21-openjdk +│   ├── freedesktop-java.desktop +│   ├── freedesktop-jconsole.desktop +│   ├── freedesktop-jshell.desktop +│   ├── install_jdk-openjdk.sh +│   ├── install_jre-openjdk-headless.sh +│   ├── install_jre-openjdk.sh +│   └── PKGBUILD ├── kodi -│   ├── 0001-ffmpeg-fix-build-with-binutils-update.patch +│   └── PKGBUILD +├── kwin +│   ├── 6178.patch +│   ├── kwin-6.2.0.tar.xz.sig +│   ├── kwin.install │   └── PKGBUILD ├── libpamac-aur +│   ├── 0001-add-arches-from-pacman-func-call.patch +│   ├── 0001-flatpak_trans_run.patch +│   ├── 0002-flatpak_runtime.patch │   ├── fix-appstream-data.hook │   ├── fix-appstream-data.sh │   ├── pamac.install │   └── PKGBUILD +├── llvm +│   ├── 0001-Enable-TuningSlowDivide64-on-Barcelona-Bobcat-Bulldo.patch +│   ├── 0002-Reduce-znver3-4-LoopMicroOpBufferSize-to-practical-l.patch +│   ├── 0003-disable-gather-znver4.patch +│   ├── llvm-SelectionDAG.patch +│   └── PKGBUILD ├── llvm-git │   ├── lib32-llvm-git │   │   └── PKGBUILD -│   ├── llvm-all -│   │   ├── bolt.patch -│   │   ├── improve-kernel-compile.patch +│   ├── llvm-git │   │   ├── llvm-config.h │   │   └── PKGBUILD -│   └── llvm-git -│   ├── llvm-config.h -│   └── PKGBUILD +│   ├── wasi-compiler-rt-git +│   │   ├── PKGBUILD +│   │   ├── WASI.cmake +│   │   └── wasi-toolchain.cmake +│   ├── wasi-libc-git +│   │   └── PKGBUILD +│   └── wasi-libcplusplus-git +│   ├── PKGBUILD +│   ├── WASI.cmake +│   └── wasi-sdk.cmake +├── localsearch +│   └── PKGBUILD ├── lz4 │   └── PKGBUILD +├── mesa +│   ├── lib32-mesa +│   │   └── PKGBUILD +│   ├── mesa +│   │   └── PKGBUILD +│   └── mesa-git +│   ├── customization.cfg +│   ├── LICENSE +│   ├── llvm32.native +│   ├── mesa-userpatches +│   │   └── README.md +│   └── PKGBUILD +├── mpv-git +│   └── PKGBUILD ├── mutter-cachyos │   ├── 1441.patch -│   ├── 3300.patch -│   ├── 3304.patch │   └── PKGBUILD -├── nvidia-explicit-sync -│   ├── egl-wayland -│   │   ├── 10_nvidia_wayland.json -│   │   ├── explicit-sync.patch +├── nodejs +│   ├── PKGBUILD +│   └── rebuild.list +├── nvidia +│   ├── lib32-nvidia-utils +│   │   └── PKGBUILD +│   ├── nvidia-390xx-utils +│   │   ├── clang.patch +│   │   ├── gcc-14.patch +│   │   ├── kernel-4.16+-memory-encryption.patch +│   │   ├── kernel-6.10.patch +│   │   ├── kernel-6.2.patch +│   │   ├── kernel-6.3.patch +│   │   ├── kernel-6.4.patch +│   │   ├── kernel-6.5.patch +│   │   ├── kernel-6.6.patch +│   │   ├── kernel-6.8.patch +│   │   ├── nvidia-390xx.rules +│   │   ├── nvidia-390xx-utils.install +│   │   ├── nvidia-390xx-utils.sysusers +│   │   ├── nvidia-drm-outputclass.conf +│   │   ├── PKGBUILD +│   │   ├── systemd-homed-override.conf +│   │   └── systemd-suspend-override.conf +│   ├── nvidia-470xx-utils +│   │   ├── 0001-Fix-conftest-to-ignore-implicit-function-declaration.patch +│   │   ├── 0002-Fix-conftest-to-use-a-short-wchar_t.patch +│   │   ├── 0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch +│   │   ├── clang.patch +│   │   ├── kernel-6.10.patch +│   │   ├── kernel-6.1.76_6.6.15_6.7.3.patch +│   │   ├── kernel-6.4.patch +│   │   ├── kernel-6.5.patch +│   │   ├── kernel-6.6.patch +│   │   ├── nvidia-470xx.rules +│   │   ├── nvidia-470xx-utils.install +│   │   ├── nvidia-470xx-utils.sysusers +│   │   ├── nvidia-drm-outputclass.conf +│   │   ├── PKGBUILD +│   │   ├── systemd-homed-override.conf +│   │   └── systemd-suspend-override.conf +│   ├── nvidia-535xx-utils +│   │   ├── 6.11-fbdev.patch +│   │   ├── linux-6.10.patch +│   │   ├── nvidia-535xx-utils.install +│   │   ├── nvidia-drm-outputclass.conf +│   │   ├── nvidia.rules +│   │   ├── nvidia-utils.sysusers │   │   └── PKGBUILD -│   ├── kwin -│   │   ├── 4693.patch -│   │   ├── kwin.install +│   ├── nvidia-550xx +│   │   ├── lib32-nvidia-550xx-utils +│   │   │   └── PKGBUILD +│   │   └── nvidia-550xx-dkms +│   │   ├── nvidia-drivers-470.223.02-gpl-pfn_valid.patch +│   │   ├── nvidia-drm-outputclass.conf +│   │   ├── nvidia.rules +│   │   ├── nvidia-utils.install +│   │   ├── nvidia-utils.sysusers +│   │   ├── PKGBUILD +│   │   ├── systemd-homed-override.conf +│   │   └── systemd-suspend-override.conf +│   ├── nvidia-open-dkms +│   │   ├── 0001-Make-modeset-and-fbdev-default-enabled.patch +│   │   ├── 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch +│   │   ├── 0003-Add-IBT-Support.patch +│   │   ├── 0004-6.11-Add-fix-for-fbdev.patch +│   │   ├── 0005-6.12-drm_outpull_pill-changed-check.patch +│   │   ├── 0006-Fix-for-6.12.0-rc1-drm_mode_config_funcs.output_poll.patch +│   │   ├── 0007-Replace-PageSwapCache-for-6.12-kernel.patch +│   │   ├── 0008-silence-event-assert-until-570.patch │   │   └── PKGBUILD -│   └── xorg-xwayland -│   ├── 967.patch -│   └── PKGBUILD -├── nvidia-modules -│   ├── nvidia-hardened +│   ├── nvidia-settings +│   │   ├── nvidia-settings-libxnvctrl_so.patch │   │   └── PKGBUILD -│   └── nvidia-zen -│   └── PKGBUILD +│   └── nvidia-utils +│   ├── 0001-Make-modeset-and-fbdev-default-enabled.patch +│   ├── 0004-6.11-Add-fix-for-fbdev.patch +│   ├── 0006-Fix-for-6.12.0-rc1-drm_mode_config_funcs.output_poll.patch +│   ├── limit-vram-buffer +│   ├── nvidia-drm-outputclass.conf +│   ├── nvidia.rules +│   ├── nvidia-sleep.conf +│   ├── nvidia-utils.install +│   ├── nvidia-utils.sysusers +│   ├── PKGBUILD +│   ├── systemd-homed-override.conf +│   └── systemd-suspend-override.conf ├── openblas │   ├── openblas-v3 │   │   └── PKGBUILD │   └── openblas-v4 │   └── PKGBUILD ├── openjdk -│   ├── java17-openjdk -│   │   ├── freedesktop-java.desktop -│   │   ├── freedesktop-jconsole.desktop -│   │   ├── freedesktop-jshell.desktop -│   │   ├── install_jdk-openjdk.sh -│   │   ├── install_jre-openjdk-headless.sh -│   │   ├── install_jre-openjdk.sh -│   │   └── PKGBUILD -│   └── java-openjdk -│   ├── clang-lto.patch +│   └── java17-openjdk │   ├── freedesktop-java.desktop │   ├── freedesktop-jconsole.desktop │   ├── freedesktop-jshell.desktop @@ -266,19 +494,25 @@ │   ├── install_jre-openjdk-headless.sh │   ├── install_jre-openjdk.sh │   └── PKGBUILD +├── opentabletdriver +│   ├── notes.install +│   ├── opentabletdriver.desktop +│   └── PKGBUILD ├── pacman -│   ├── 0001-use-snprintf-instead-of-sprintf.patch │   ├── 78cd453.patch +│   ├── alpm.sysusers │   ├── disable-always-stale.patch +│   ├── fix-alpm-crate-for-aarch64.patch │   ├── makepkg.conf │   ├── pacman.conf │   ├── PKGBUILD -│   ├── repo-add +│   ├── rust.conf +│   ├── sqlite-src-3460100.zip │   └── static_sqlite.patch -├── pak-git +├── pacutils +│   ├── Add-PrettyProgressBar-config-option.patch │   └── PKGBUILD -├── paru -│   ├── alpm-14.patch +├── pak-git │   └── PKGBUILD ├── php │   ├── 0005-Enable-hugepages.patch @@ -290,80 +524,37 @@ │   ├── php-fpm.patch │   ├── php-fpm.tmpfiles │   ├── php.ini.patch +│   ├── PKGBUILD +│   └── PKGBUILD.pgo +├── power-profiles-daemon │   └── PKGBUILD ├── proton-cachyos -│   ├── proton-8-cachyos -│   │   ├── 0001-AUR-Pkgbuild-changes.patch -│   │   ├── 0002-AUR-Do-not-update-cargo-crates.patch -│   │   ├── 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch -│   │   ├── 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch -│   │   ├── 0005-AUR-Strip-binaries-early.patch -│   │   ├── 0006-AUR-Fix-hwnd-redefinition.patch -│   │   ├── amd-fsr.patch -│   │   ├── disable-fastsync.patch -│   │   ├── dxvk-reflex-lockfix.patch -│   │   ├── dxvk-reflex.patch -│   │   ├── fastsync.patch -│   │   ├── nvapi-reflex.patch -│   │   ├── optimization.patch -│   │   ├── PKGBUILD -│   │   ├── proton-8-cachyos.install -│   │   ├── server-Enable-link-time-optimization.patch -│   │   ├── vkd3d-reflex.patch -│   │   └── wine-reflex.patch -│   └── proton-cachyos -│   ├── amd-fsr.patch -│   ├── disable-fastsync.patch -│   ├── dxvk-reflex.patch -│   ├── fastsync.patch -│   ├── optimization.patch -│   ├── PKGBUILD -│   ├── proton-cachyos.install -│   ├── server-Enable-link-time-optimization.patch -│   ├── wayland-upstream.patch -│   └── wine-reflex.patch +│   ├── dxvk-reflex.patch +│   ├── PKGBUILD +│   └── proton-cachyos.install ├── python -│   ├── 0003-AVX2-and-AVX512-support.patch -│   ├── 0004-Build-avx2-and-avx512-versions-of-the-math-library.patch -│   ├── bolt2.patch -│   ├── boltorg.patch -│   ├── bolt.patch +│   ├── canrebuild │   ├── EXTERNALLY-MANAGED +│   ├── genrebuild │   └── PKGBUILD -├── python-312 -│   └── PKGBUILD -├── python-pytorch -│   ├── 87773.patch -│   ├── disable-werror1.patch -│   ├── disable-werror2.patch -│   ├── disable-werror4.patch -│   ├── ffmpeg4.4.patch -│   ├── fix-building-for-torchvision.patch -│   ├── fix_include_system.patch -│   ├── glog-0.7.patch -│   ├── patch.patch -│   ├── PKGBUILD -│   ├── protobuf-23.patch -│   ├── python-pytorch-ffmpeg6.patch -│   ├── python-pytorch-fix-cuda-12_4.patch -│   ├── python-pytorch-goo-rocm-6.patch -│   ├── python-pytorch-rocm-6.patch -│   ├── pytorch-missing-iostream.patch -│   ├── pytorch-remove-caffe2-binaries.patch -│   ├── pytorch-rocm-jit.patch -│   ├── rocblas-batched.patch -│   ├── test.py -│   └── use-system-libuv.patch ├── README.md ├── ripgrep │   ├── optimize.patch │   └── PKGBUILD +├── scx-scheds +│   ├── scx-scheds +│   │   └── PKGBUILD +│   └── scx-scheds-git +│   └── PKGBUILD +├── sddm +│   ├── 0001-Revert-cmake-remove-the-final-Arch-PAM-modules.patch +│   └── PKGBUILD ├── sqlite3 │   ├── license.txt │   ├── PKGBUILD -│   ├── sqlite-doc-3450100.zip -│   ├── sqlite-lemon-system-template.patch -│   └── sqlite-src-3450100.zip +│   └── sqlite-lemon-system-template.patch +├── svt-av1 +│   └── PKGBUILD ├── svt-av1-psy │   └── PKGBUILD ├── systemd-boot-manager @@ -374,79 +565,91 @@ │   ├── sdboot-manage │   ├── sdboot-manage.conf │   └── sdboot-systemd-update.hook +├── tinysparql +│   └── PKGBUILD ├── toolchain │   ├── binutils │   │   ├── gold-warn-unsupported.patch │   │   └── PKGBUILD │   ├── gcc +│   │   ├── 0001-Zen5-tuning-part-2-disable-gather-and-scatter.patch +│   │   ├── 0002-Zen5-tuning-part-3-scheduler-tweaks.patch +│   │   ├── 0003-Zen5-tuning-part-4-update-reassocation-width.patch +│   │   ├── 0004-Zen5-tuning-part-5-update-instruction-latencies-in-x.patch │   │   ├── c89 │   │   ├── c99 -│   │   ├── fb77ca05ffb4f8e666878f2f6718a9fb4d686839.patch │   │   ├── gcc-ada-repro.patch │   │   └── PKGBUILD │   ├── glibc +│   │   ├── clearlinux.patch +│   │   ├── evex.patch │   │   ├── glibc.install │   │   ├── lib32-glibc.conf +│   │   ├── lib32-glibc.install │   │   ├── locale-gen │   │   ├── locale.gen.txt │   │   ├── PKGBUILD │   │   ├── sdt-config.h │   │   └── sdt.h -│   ├── glibc-eac -│   │   ├── glibc-eac.patch -│   │   ├── glibc.install -│   │   ├── lib32-glibc.conf -│   │   ├── locale-gen -│   │   ├── locale.gen.txt -│   │   ├── PKGBUILD -│   │   ├── sdt-config.h -│   │   └── sdt.h -│   └── linux-api-headers -│   └── PKGBUILD -├── uksmd -│   ├── README.md -│   ├── uksmd-git +│   ├── libpfm │   │   └── PKGBUILD -│   └── uksmd-lts -│   ├── 0001-uksmdstats-fixes.patch -│   └── PKGBUILD -├── wayfire-packages -│   ├── wayfire-desktop-git +│   ├── libtool +│   │   ├── disable-lto-link-order2.patch +│   │   └── PKGBUILD +│   ├── linux-api-headers +│   │   ├── ntsync.patch │   │   └── PKGBUILD -│   └── wlogout +│   ├── linux-tools +│   │   ├── cpupower.default +│   │   ├── cpupower.install +│   │   ├── cpupower.service +│   │   ├── cpupower.systemd +│   │   ├── hv_kvp_daemon.service +│   │   ├── hv_vss_daemon.service +│   │   ├── PKGBUILD +│   │   └── usbipd.service +│   └── pahole +│   ├── 0001-CMakeLists.txt-Install-ostra.py-into-Python3_SITELIB.patch +│   ├── fix-kernel-lto.patch │   └── PKGBUILD -├── winesync -│   ├── 99-winesync.rules -│   ├── dkms.conf -│   ├── Makefile +├── vapormark-git +│   └── PKGBUILD +├── wine-cachyos +│   ├── 30-win32-aliases.conf │   ├── PKGBUILD -│   ├── winesync.c-9ac10c6e711ec096274ecc676ae83a7cf2a1213f -│   ├── winesync.conf -│   └── winesync.h-9ac10c6e711ec096274ecc676ae83a7cf2a1213f +│   ├── wine-binfmt.conf +│   └── wine.install +├── wine-cachyos-opt +│   ├── 30-win32-aliases.conf +│   ├── PKGBUILD +│   ├── wine-binfmt.conf +│   └── wine.install ├── xz -│   ├── xz -│   │   └── PKGBUILD -│   └── xz-pgo -│   └── PKGBUILD +│   ├── add-pgo.patch +│   └── PKGBUILD ├── zfs-meta │   └── PKGBUILD +├── zlib-ng +│   ├── lib32-zlib-ng +│   │   └── PKGBUILD +│   └── zlib-ng +│   └── PKGBUILD ├── zsh │   ├── 0001-50629-do-not-use-egrep-in-tests.patch -│   ├── fix-autocompletion.patch +│   ├── 0001-50641-use-int-main.patch +│   ├── 0002-50325-fix-autocompletion.patch +│   ├── 0003-51862-support-texinfo-7-0.patch +│   ├── 0004-pcre2.patch +│   ├── 0005-52383-avoid-incompatible-pointer-types.patch │   ├── PKGBUILD │   ├── zprofile │   └── zsh.install └── zstd ├── lib32-zstd - │   ├── PKGBUILD - │   ├── zstd-1.5.6.tar.zst - │   └── zstd-1.5.6.tar.zst.sig + │   └── PKGBUILD ├── zstd - │   ├── PKGBUILD - │   ├── zstd-1.5.6-2-x86_64.pkg.tar.zst - │   ├── zstd-1.5.6.tar.zst - │   └── zstd-1.5.6.tar.zst.sig + │   └── PKGBUILD └── zstd-pgo └── PKGBUILD -112 directories, 338 files +174 directories, 479 files diff --git a/cachyos-dwl-config/PKGBUILD b/cachyos-dwl-config/PKGBUILD deleted file mode 100644 index 9b9afaa5..00000000 --- a/cachyos-dwl-config/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Devin J. Pohly -pkgname=dwl-git -pkgver=0.2.1.r34.2d9740c -pkgrel=1 -pkgdesc="Simple, hackable dynamic tiling Wayland compositor (dwm for Wayland)" -arch=('x86_64') -url="https://github.com/djpohly/dwl" -license=(GPL-1.0-only) -depends=('wlroots>=0.13') -makedepends=('git' 'wayland-protocols') -optdepends=('xorg-xwayland: for XWayland support') -provides=("${pkgname%-git}") -conflicts=("${pkgname%-git}") -# append #branch=wlroots-next to build against wlroots-git -source=('git+https://github.com/djpohly/dwl' - config.h) -sha256sums=('SKIP' 'SKIP') - -prepare() { - cd "$srcdir/${pkgname%-git}" - cp "$srcdir/config.h" config.h - # Uncomment to compile with XWayland support - #sed -i -e '/-DXWAYLAND/s/^#//' config.mk -} - -pkgver() { - cd "$srcdir/${pkgname%-git}" - printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')" -} - -build() { - cd "$srcdir/${pkgname%-git}" - make -} - -package() { - cd "$srcdir/${pkgname%-git}" - make PREFIX="$pkgdir/usr/" install -} diff --git a/cachyos-dwl-config/config.h b/cachyos-dwl-config/config.h deleted file mode 100644 index 089aa379..00000000 --- a/cachyos-dwl-config/config.h +++ /dev/null @@ -1,116 +0,0 @@ -/* appearance */ -static const int sloppyfocus = 1; /* focus follows mouse */ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const float rootcolor[] = {0.3, 0.3, 0.3, 1.0}; -static const float bordercolor[] = {0.5, 0.5, 0.5, 1.0}; -static const float focuscolor[] = {1.0, 0.0, 0.0, 1.0}; - -/* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - -static const Rule rules[] = { - /* app_id title tags mask isfloating monitor */ - /* examples: - { "Gimp", NULL, 0, 1, -1 }, - { "firefox", NULL, 1 << 8, 0, -1 }, - */ -}; - -/* layout(s) */ -static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, -}; - -/* monitors - * The order in which monitors are defined determines their position. - * Non-configured monitors are always added to the left. */ -static const MonitorRule monrules[] = { - /* name mfact nmaster scale layout rotate/reflect x y */ - /* example of a HiDPI laptop monitor: - { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 }, - */ - /* defaults */ - { NULL, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 }, -}; - -/* keyboard */ -static const struct xkb_rule_names xkb_rules = { - /* can specify fields: rules, model, layout, variant, options */ - /* example: - .options = "ctrl:nocaps", - */ -}; - -static const int repeat_rate = 25; -static const int repeat_delay = 600; - -/* Trackpad */ -static const int tap_to_click = 1; -static const int natural_scrolling = 0; - -#define MODKEY WLR_MODIFIER_ALT -#define TAGKEYS(KEY,SKEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} } - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -static const char *termcmd[] = { "alacritty", NULL }; -static const char *menucmd[] = { "bemenu-run", NULL }; - -static const Key keys[] = { - /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ - /* modifier key function argument */ - { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, - { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, - { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, - { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, - { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, - { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} }, - { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} }, - { MODKEY, XKB_KEY_Return, zoom, {0} }, - { MODKEY, XKB_KEY_Tab, view, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, - { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XKB_KEY_space, setlayout, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, - { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, - { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, - { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, - TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), - TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), - TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), - TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3), - TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4), - TAGKEYS( XKB_KEY_6, XKB_KEY_caret, 5), - TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6), - TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), - TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} }, - - /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ - { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, -#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } - CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), - CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), -}; - -static const Button buttons[] = { - { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, - { MODKEY, BTN_MIDDLE, togglefloating, {0} }, - { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, -}; diff --git a/cachyos-dwm-config/PKGBUILD b/cachyos-dwm-config/PKGBUILD deleted file mode 100644 index 2b69c6a4..00000000 --- a/cachyos-dwm-config/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Vladislav Nepogodin (vnepogodin) -# Contributor: Sergej Pupykin -# Contributor: Dag Odenhall -# Contributor: Grigorios Bouzakis - -pkgname=cachyos-dwm-config -pkgver=6.3 -pkgrel=2 -pkgdesc="A dynamic window manager for X" -url="https://dwm.suckless.org" -arch=('i686' 'x86_64' 'x86_64_v3') -license=('MIT') -options=(zipman) -depends=('libx11' 'libxinerama' 'libxft' 'freetype2' 'st' 'dmenu') -install=dwm.install -source=(dwm.desktop - https://dl.suckless.org/dwm/dwm-$pkgver.tar.gz - config.h - https://dwm.suckless.org/patches/autostart/dwm-autostart-20210120-cb3f58a.diff - dwm-vanitygaps-6.3.diff - dwm-cyclelayouts-20220327-6.3.diff - dwm-colorbar-6.2.diff - dwm-xrdb-6.2.diff - https://dwm.suckless.org/patches/rotatestack/dwm-rotatestack-20161021-ab9571b.diff) -sha256sums=('bc36426772e1471d6dd8c8aed91f288e16949e3463a9933fee6390ee0ccd3f81' - 'badaa028529b1fba1fd7f9a84f3b64f31190466c858011b53e2f7b70c6a3078d' - '72fab392ac3b8ded668c8dbfc95fde388c3345e095beefaf6200543dfd3ec53b' - 'd78711587e6d554de5dc47adca00fc1eb6c8f8ca11c9e75411da8da60eae7abe' - '017baefdc65c0c10f2ebaa98460ec4cb9b809ed0ae39a22ae794bae6a2e06f2e' - '43958d1402ea543d57d3bc5a52096348fc6379b85af929f0bf95fdfef73c47f1' - '6d5cb096f1e1cd1d90b91057cb8e7eacec1f487a4bbd31bd874472d28f9d7a92' - '41661da484163fbc606e61fbc52ba189972a7052d445737a670b4b5684cfdf6e' - '27c889d424e1b539cd8b113d0c4f9693be521a0a2ef5adf246ecf3efb4208f3c') -provides=('dwm') -conflicts=('dwm') - -prepare() { - cd "$srcdir/dwm-$pkgver" - patch -Np1 -i ${srcdir}/dwm-autostart-20210120-cb3f58a.diff - patch -Np1 -i ${srcdir}/dwm-vanitygaps-6.3.diff - patch -Np1 -i ${srcdir}/dwm-cyclelayouts-20220327-6.3.diff - patch -Np1 -i ${srcdir}/dwm-colorbar-6.2.diff - patch -Np1 -i ${srcdir}/dwm-xrdb-6.2.diff - patch -Np1 -i ${srcdir}/dwm-rotatestack-20161021-ab9571b.diff - cp "$srcdir/config.h" config.h -} - -build() { - cd "$srcdir/dwm-$pkgver" - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2 -} - -package() { - cd "$srcdir/dwm-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/dwm/LICENSE" - install -Dm644 README "$pkgdir/usr/share/doc/dwm/README" - install -Dm644 "$srcdir/dwm.desktop" "$pkgdir/usr/share/xsessions/dwm.desktop" -} diff --git a/cachyos-dwm-config/config.h b/cachyos-dwm-config/config.h deleted file mode 100644 index 6b6e9bb6..00000000 --- a/cachyos-dwm-config/config.h +++ /dev/null @@ -1,179 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* appearance */ -static const unsigned int borderpx = 3; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const unsigned int gappih = 10; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */ -static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const int tagWidthExtra = 4; /* Add extra width to tags. 0 means default width (16). */ -static const int user_bh = 24; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */ -static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; -static char normbgcolor[] = "#3b4252"; -static char normbordercolor[] = "#2E3440"; -static char normfgcolor[] = "#d8dee9"; -static char selfgcolor[] = "#2e3440"; -static char selbordercolor[] = "#5E81AC"; -static char selbgcolor[] = "#5E81AC"; -static char col_red[] = "#BF616A"; -static char col_blue[] = "#5E81AC"; -static char col_cyan[] = "#B48EAD"; -static char col_dark[] = "#4C566A"; -static char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, - [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, - [SchemeStatus] = { normfgcolor, "#4C566A", "#000000" }, // Statusbar right {text,background,not used but cannot be empty} - [SchemeTagsSel] = { selfgcolor, selbgcolor, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} - [SchemeTagsNorm] = { normfgcolor, "#4C566A", "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty} - [SchemeInfoSel] = { "#4C566A", selbgcolor, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty} - [SchemeInfoNorm] = { normfgcolor, col_dark, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty} - -}; - -/* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - -static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ - /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ -static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ - -#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ -#include "vanitygaps.c" - -static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "[M]", monocle }, - { "[@]", spiral }, - //{ "[\\]", dwindle }, - //{ "H[]", deck }, - { "TTT", bstack }, - //{ "===", bstackhoriz }, - //{ "HHH", grid }, - //{ "###", nrowgrid }, - { "---", horizgrid }, - //{ ":::", gaplessgrid }, - { "|M|", centeredmaster }, - //{ ">M>", centeredfloatingmaster }, - { "><>", NULL }, /* no layout function means floating behavior */ - { NULL, NULL }, -}; - -/* key definitions */ -#define MODKEY Mod1Mask -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; -static const char *termcmd[] = { "st", NULL }; - -static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_b, togglebar, {0} }, - { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY|ControlMask, XK_i, incnmaster, {.i = +1 } }, - { MODKEY|ControlMask, XK_v, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_Return, zoom, {0} }, - - /* Gaps */ - { MODKEY|Mod1Mask, XK_u, incrgaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_u, incrgaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_i, incrigaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_i, incrigaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_o, incrogaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_o, incrogaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_6, incrihgaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_6, incrihgaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_7, incrivgaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_7, incrivgaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_8, incrohgaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_8, incrohgaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_9, incrovgaps, {.i = +4 } }, - { MODKEY|Mod1Mask|ShiftMask, XK_9, incrovgaps, {.i = -4 } }, - { MODKEY|Mod1Mask, XK_0, togglegaps, {0} }, - { MODKEY|Mod1Mask|ShiftMask, XK_0, defaultgaps, {0} }, - - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_q, killclient, {0} }, - - /* Layouts */ - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } }, - { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - - { MODKEY, XK_F5, xrdb, {.v = NULL } }, /* Reload Xresources */ - - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_e, quit, {0} }, - { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} }, -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, - { ClkTagBar, 0, Button1, view, {0} }, - { ClkTagBar, 0, Button3, toggleview, {0} }, - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, -}; - diff --git a/cachyos-dwm-config/dwm-colorbar-6.2.diff b/cachyos-dwm-config/dwm-colorbar-6.2.diff deleted file mode 100644 index 19154e0d..00000000 --- a/cachyos-dwm-config/dwm-colorbar-6.2.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 1c0b587..a516645 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -16,6 +16,11 @@ static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -+ [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty} -+ [SchemeTagsSel] = { col_gray4, col_cyan, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} -+ [SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty} -+ [SchemeInfoSel] = { col_gray4, col_cyan, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty} -+ [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty} - }; - - /* tagging */ -diff --git a/dwm.c b/dwm.c -index 4465af1..0d1d2f7 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -60,7 +60,7 @@ - - /* enums */ - enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ --enum { SchemeNorm, SchemeSel }; /* color schemes */ -+enum { SchemeNorm, SchemeSel, SchemeStatus, SchemeTagsSel, SchemeTagsNorm, SchemeInfoSel, SchemeInfoNorm }; /* color schemes */ - enum { NetSupported, NetWMName, NetWMState, NetWMCheck, - NetWMFullscreen, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ -@@ -738,7 +738,7 @@ drawbar(Monitor *m) - - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ -- drw_setscheme(drw, scheme[SchemeNorm]); -+ drw_setscheme(drw, scheme[SchemeStatus]); - tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ - drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); - } -@@ -751,7 +751,7 @@ drawbar(Monitor *m) - x = 0; - for (i = 0; i < LENGTH(tags); i++) { - w = TEXTW(tags[i]); -- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); -+ drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); - if (occ & 1 << i) - drw_rect(drw, x + boxs, boxs, boxw, boxw, -@@ -760,17 +760,17 @@ drawbar(Monitor *m) - x += w; - } - w = blw = TEXTW(m->ltsymbol); -- drw_setscheme(drw, scheme[SchemeNorm]); -+ drw_setscheme(drw, scheme[SchemeTagsNorm]); - x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - - if ((w = m->ww - tw - x) > bh) { - if (m->sel) { -- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); -+ drw_setscheme(drw, scheme[m == selmon ? SchemeInfoSel : SchemeInfoNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); - if (m->sel->isfloating) - drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); - } else { -- drw_setscheme(drw, scheme[SchemeNorm]); -+ drw_setscheme(drw, scheme[SchemeInfoNorm]); - drw_rect(drw, x, 0, w, bh, 1, 1); - } - } diff --git a/cachyos-dwm-config/dwm-cyclelayouts-20220327-6.3.diff b/cachyos-dwm-config/dwm-cyclelayouts-20220327-6.3.diff deleted file mode 100644 index d1af54de..00000000 --- a/cachyos-dwm-config/dwm-cyclelayouts-20220327-6.3.diff +++ /dev/null @@ -1,85 +0,0 @@ -From a09e766a4342f580582082a92b2de65f33208eb4 Mon Sep 17 00:00:00 2001 -From: Christopher Drelich -Date: Thu, 24 May 2018 00:56:56 -0400 -Subject: [PATCH] Function to cycle through available layouts. - -MOD-CTRL-, and MOD-CTRL-. -cycle backwards and forwards through available layouts. -Probably only useful if you have a lot of additional layouts. -The NULL, NULL layout should always be the last layout in your list, -in order to guarantee consistent behavior. ---- - config.def.h | 3 +++ - dwm.1 | 6 ++++++ - dwm.c | 18 ++++++++++++++++++ - 3 files changed, 27 insertions(+) - -diff --git a/config.def.h b/config.def.h -index a9ac303..153b880 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -76,6 +77,8 @@ static Key keys[] = { - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, -+ { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } }, -+ { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, -diff --git a/dwm.1 b/dwm.1 -index 13b3729..165891b 100644 ---- a/dwm.1 -+++ b/dwm.1 -@@ -92,6 +92,12 @@ Sets monocle layout. - .B Mod1\-space - Toggles between current and previous layout. - .TP -+.B Mod1\-Control\-, -+Cycles backwards in layout list. -+.TP -+.B Mod1\-Control\-. -+Cycles forwards in layout list. -+.TP - .B Mod1\-j - Focus next window. - .TP -diff --git a/dwm.c b/dwm.c -index bb95e26..db73000 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -157,6 +157,7 @@ static void configure(Client *c); - static void configurenotify(XEvent *e); - static void configurerequest(XEvent *e); - static Monitor *createmon(void); -+static void cyclelayout(const Arg *arg); - static void destroynotify(XEvent *e); - static void detach(Client *c); - static void detachstack(Client *c); -@@ -645,6 +646,23 @@ createmon(void) - } - - void -+cyclelayout(const Arg *arg) { -+ Layout *l; -+ for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++); -+ if(arg->i > 0) { -+ if(l->symbol && (l + 1)->symbol) -+ setlayout(&((Arg) { .v = (l + 1) })); -+ else -+ setlayout(&((Arg) { .v = layouts })); -+ } else { -+ if(l != layouts && (l - 1)->symbol) -+ setlayout(&((Arg) { .v = (l - 1) })); -+ else -+ setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] })); -+ } -+} -+ -+void - destroynotify(XEvent *e) - { - Client *c; --- -2.7.4 - diff --git a/cachyos-dwm-config/dwm-vanitygaps-6.3.diff b/cachyos-dwm-config/dwm-vanitygaps-6.3.diff deleted file mode 100644 index c4ccb284..00000000 --- a/cachyos-dwm-config/dwm-vanitygaps-6.3.diff +++ /dev/null @@ -1,973 +0,0 @@ -From 9709d08daa290c8c7319571cd9e6ef4ec40e7683 Mon Sep 17 00:00:00 2001 -From: bakkeby -Date: Wed, 6 May 2020 17:21:25 +0200 -Subject: [PATCH] vanitygaps - adds gaps to layouts - -This patch differentiates between inner and outer gaps as well as -horizontal and vertical gaps. - -The logic of these layouts also aims to be pixel perfect by ensuring -an even split of the available space and re-distributing the remainder -among the available clients. ---- - config.def.h | 38 ++- - dwm.c | 35 +-- - vanitygaps.c | 809 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 854 insertions(+), 28 deletions(-) - create mode 100644 vanitygaps.c - -diff --git a/config.def.h b/config.def.h -index 1c0b587..a886863 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -3,6 +3,11 @@ - /* appearance */ - static const unsigned int borderpx = 1; /* border pixel of windows */ - static const unsigned int snap = 32; /* snap pixel */ -+static const unsigned int gappih = 20; /* horiz inner gap between windows */ -+static const unsigned int gappiv = 10; /* vert inner gap between windows */ -+static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -+static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ -+static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ - static const int showbar = 1; /* 0 means no bar */ - static const int topbar = 1; /* 0 means bottom bar */ - static const char *fonts[] = { "monospace:size=10" }; -@@ -36,11 +41,26 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95] - static const int nmaster = 1; /* number of clients in master area */ - static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ - -+#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ -+#include "vanitygaps.c" -+ - static const Layout layouts[] = { - /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ -- { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, -+ { "[@]", spiral }, -+ { "[\\]", dwindle }, -+ { "H[]", deck }, -+ { "TTT", bstack }, -+ { "===", bstackhoriz }, -+ { "HHH", grid }, -+ { "###", nrowgrid }, -+ { "---", horizgrid }, -+ { ":::", gaplessgrid }, -+ { "|M|", centeredmaster }, -+ { ">M>", centeredfloatingmaster }, -+ { "><>", NULL }, /* no layout function means floating behavior */ -+ { NULL, NULL }, - }; - - /* key definitions */ -@@ -71,6 +91,22 @@ static Key keys[] = { - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, -+ { MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_o, incrogaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_6, incrihgaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_7, incrivgaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_8, incrohgaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_9, incrovgaps, {.i = +1 } }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } }, -+ { MODKEY|Mod4Mask, XK_0, togglegaps, {0} }, -+ { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, -diff --git a/dwm.c b/dwm.c -index 4465af1..c3b2d82 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -119,6 +119,10 @@ struct Monitor { - int by; /* bar geometry */ - int mx, my, mw, mh; /* screen size */ - int wx, wy, ww, wh; /* window area */ -+ int gappih; /* horizontal gap between windows */ -+ int gappiv; /* vertical gap between windows */ -+ int gappoh; /* horizontal outer gaps */ -+ int gappov; /* vertical outer gaps */ - unsigned int seltags; - unsigned int sellt; - unsigned int tagset[2]; -@@ -208,7 +212,6 @@ static void sigchld(int unused); - static void spawn(const Arg *arg); - static void tag(const Arg *arg); - static void tagmon(const Arg *arg); --static void tile(Monitor *); - static void togglebar(const Arg *arg); - static void togglefloating(const Arg *arg); - static void toggletag(const Arg *arg); -@@ -638,6 +641,10 @@ createmon(void) - m->nmaster = nmaster; - m->showbar = showbar; - m->topbar = topbar; -+ m->gappih = gappih; -+ m->gappiv = gappiv; -+ m->gappoh = gappoh; -+ m->gappov = gappov; - m->lt[0] = &layouts[0]; - m->lt[1] = &layouts[1 % LENGTH(layouts)]; - strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); -@@ -1764,34 +1771,6 @@ tagmon(const Arg *arg) - sendmon(selmon->sel, dirtomon(arg->i)); - } - --void --tile(Monitor *m) --{ -- unsigned int i, n, h, mw, my, ty; -- Client *c; -- -- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); -- if (n == 0) -- return; -- -- if (n > m->nmaster) -- mw = m->nmaster ? m->ww * m->mfact : 0; -- else -- mw = m->ww; -- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -- if (i < m->nmaster) { -- h = (m->wh - my) / (MIN(n, m->nmaster) - i); -- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); -- if (my + HEIGHT(c) < m->wh) -- my += HEIGHT(c); -- } else { -- h = (m->wh - ty) / (n - i); -- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); -- if (ty + HEIGHT(c) < m->wh) -- ty += HEIGHT(c); -- } --} -- - void - togglebar(const Arg *arg) - { -diff --git a/vanitygaps.c b/vanitygaps.c -new file mode 100644 -index 0000000..3f31593 ---- /dev/null -+++ b/vanitygaps.c -@@ -0,0 +1,809 @@ -+/* Key binding functions */ -+static void defaultgaps(const Arg *arg); -+static void incrgaps(const Arg *arg); -+static void incrigaps(const Arg *arg); -+static void incrogaps(const Arg *arg); -+static void incrohgaps(const Arg *arg); -+static void incrovgaps(const Arg *arg); -+static void incrihgaps(const Arg *arg); -+static void incrivgaps(const Arg *arg); -+static void togglegaps(const Arg *arg); -+/* Layouts (delete the ones you do not need) */ -+static void bstack(Monitor *m); -+static void bstackhoriz(Monitor *m); -+static void centeredmaster(Monitor *m); -+static void centeredfloatingmaster(Monitor *m); -+static void deck(Monitor *m); -+static void dwindle(Monitor *m); -+static void fibonacci(Monitor *m, int s); -+static void grid(Monitor *m); -+static void nrowgrid(Monitor *m); -+static void spiral(Monitor *m); -+static void tile(Monitor *m); -+/* Internals */ -+static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc); -+static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr); -+static void setgaps(int oh, int ov, int ih, int iv); -+ -+/* Settings */ -+#if !PERTAG_PATCH -+static int enablegaps = 1; -+#endif // PERTAG_PATCH -+ -+void -+setgaps(int oh, int ov, int ih, int iv) -+{ -+ if (oh < 0) oh = 0; -+ if (ov < 0) ov = 0; -+ if (ih < 0) ih = 0; -+ if (iv < 0) iv = 0; -+ -+ selmon->gappoh = oh; -+ selmon->gappov = ov; -+ selmon->gappih = ih; -+ selmon->gappiv = iv; -+ arrange(selmon); -+} -+ -+void -+togglegaps(const Arg *arg) -+{ -+ #if PERTAG_PATCH -+ selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag]; -+ #else -+ enablegaps = !enablegaps; -+ #endif // PERTAG_PATCH -+ arrange(NULL); -+} -+ -+void -+defaultgaps(const Arg *arg) -+{ -+ setgaps(gappoh, gappov, gappih, gappiv); -+} -+ -+void -+incrgaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh + arg->i, -+ selmon->gappov + arg->i, -+ selmon->gappih + arg->i, -+ selmon->gappiv + arg->i -+ ); -+} -+ -+void -+incrigaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh, -+ selmon->gappov, -+ selmon->gappih + arg->i, -+ selmon->gappiv + arg->i -+ ); -+} -+ -+void -+incrogaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh + arg->i, -+ selmon->gappov + arg->i, -+ selmon->gappih, -+ selmon->gappiv -+ ); -+} -+ -+void -+incrohgaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh + arg->i, -+ selmon->gappov, -+ selmon->gappih, -+ selmon->gappiv -+ ); -+} -+ -+void -+incrovgaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh, -+ selmon->gappov + arg->i, -+ selmon->gappih, -+ selmon->gappiv -+ ); -+} -+ -+void -+incrihgaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh, -+ selmon->gappov, -+ selmon->gappih + arg->i, -+ selmon->gappiv -+ ); -+} -+ -+void -+incrivgaps(const Arg *arg) -+{ -+ setgaps( -+ selmon->gappoh, -+ selmon->gappov, -+ selmon->gappih, -+ selmon->gappiv + arg->i -+ ); -+} -+ -+void -+getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) -+{ -+ unsigned int n, oe, ie; -+ #if PERTAG_PATCH -+ oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag]; -+ #else -+ oe = ie = enablegaps; -+ #endif // PERTAG_PATCH -+ Client *c; -+ -+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); -+ if (smartgaps && n == 1) { -+ oe = 0; // outer gaps disabled when only one client -+ } -+ -+ *oh = m->gappoh*oe; // outer horizontal gap -+ *ov = m->gappov*oe; // outer vertical gap -+ *ih = m->gappih*ie; // inner horizontal gap -+ *iv = m->gappiv*ie; // inner vertical gap -+ *nc = n; // number of clients -+} -+ -+void -+getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr) -+{ -+ unsigned int n; -+ float mfacts, sfacts; -+ int mtotal = 0, stotal = 0; -+ Client *c; -+ -+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); -+ mfacts = MIN(n, m->nmaster); -+ sfacts = n - m->nmaster; -+ -+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) -+ if (n < m->nmaster) -+ mtotal += msize / mfacts; -+ else -+ stotal += ssize / sfacts; -+ -+ *mf = mfacts; // total factor of master area -+ *sf = sfacts; // total factor of stack area -+ *mr = msize - mtotal; // the remainder (rest) of pixels after an even master split -+ *sr = ssize - stotal; // the remainder (rest) of pixels after an even stack split -+} -+ -+/*** -+ * Layouts -+ */ -+ -+/* -+ * Bottomstack layout + gaps -+ * https://dwm.suckless.org/patches/bottomstack/ -+ */ -+static void -+bstack(Monitor *m) -+{ -+ unsigned int i, n; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ float mfacts, sfacts; -+ int mrest, srest; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ sh = mh = m->wh - 2*oh; -+ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); -+ sw = m->ww - 2*ov - iv * (n - m->nmaster - 1); -+ -+ if (m->nmaster && n > m->nmaster) { -+ sh = (mh - ih) * (1 - m->mfact); -+ mh = mh - ih - sh; -+ sx = mx; -+ sy = my + mh + ih; -+ } -+ -+ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { -+ if (i < m->nmaster) { -+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); -+ mx += WIDTH(c) + iv; -+ } else { -+ resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); -+ sx += WIDTH(c) + iv; -+ } -+ } -+} -+ -+static void -+bstackhoriz(Monitor *m) -+{ -+ unsigned int i, n; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ float mfacts, sfacts; -+ int mrest, srest; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ mh = m->wh - 2*oh; -+ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); -+ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); -+ sw = m->ww - 2*ov; -+ -+ if (m->nmaster && n > m->nmaster) { -+ sh = (mh - ih) * (1 - m->mfact); -+ mh = mh - ih - sh; -+ sy = my + mh + ih; -+ sh = m->wh - mh - 2*oh - ih * (n - m->nmaster); -+ } -+ -+ getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest); -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { -+ if (i < m->nmaster) { -+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); -+ mx += WIDTH(c) + iv; -+ } else { -+ resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); -+ sy += HEIGHT(c) + ih; -+ } -+ } -+} -+ -+/* -+ * Centred master layout + gaps -+ * https://dwm.suckless.org/patches/centeredmaster/ -+ */ -+void -+centeredmaster(Monitor *m) -+{ -+ unsigned int i, n; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int lx = 0, ly = 0, lw = 0, lh = 0; -+ int rx = 0, ry = 0, rw = 0, rh = 0; -+ float mfacts = 0, lfacts = 0, rfacts = 0; -+ int mtotal = 0, ltotal = 0, rtotal = 0; -+ int mrest = 0, lrest = 0, rrest = 0; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ /* initialize areas */ -+ mx = m->wx + ov; -+ my = m->wy + oh; -+ mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1); -+ mw = m->ww - 2*ov; -+ lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1); -+ rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1)); -+ -+ if (m->nmaster && n > m->nmaster) { -+ /* go mfact box in the center if more than nmaster clients */ -+ if (n - m->nmaster > 1) { -+ /* ||<-S->|<---M--->|<-S->|| */ -+ mw = (m->ww - 2*ov - 2*iv) * m->mfact; -+ lw = (m->ww - mw - 2*ov - 2*iv) / 2; -+ rw = (m->ww - mw - 2*ov - 2*iv) - lw; -+ mx += lw + iv; -+ } else { -+ /* ||<---M--->|<-S->|| */ -+ mw = (mw - iv) * m->mfact; -+ lw = 0; -+ rw = m->ww - mw - iv - 2*ov; -+ } -+ lx = m->wx + ov; -+ ly = m->wy + oh; -+ rx = mx + mw + iv; -+ ry = m->wy + oh; -+ } -+ -+ /* calculate facts */ -+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) { -+ if (!m->nmaster || n < m->nmaster) -+ mfacts += 1; -+ else if ((n - m->nmaster) % 2) -+ lfacts += 1; // total factor of left hand stack area -+ else -+ rfacts += 1; // total factor of right hand stack area -+ } -+ -+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) -+ if (!m->nmaster || n < m->nmaster) -+ mtotal += mh / mfacts; -+ else if ((n - m->nmaster) % 2) -+ ltotal += lh / lfacts; -+ else -+ rtotal += rh / rfacts; -+ -+ mrest = mh - mtotal; -+ lrest = lh - ltotal; -+ rrest = rh - rtotal; -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { -+ if (!m->nmaster || i < m->nmaster) { -+ /* nmaster clients are stacked vertically, in the center of the screen */ -+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); -+ my += HEIGHT(c) + ih; -+ } else { -+ /* stack clients are stacked vertically */ -+ if ((i - m->nmaster) % 2 ) { -+ resize(c, lx, ly, lw - (2*c->bw), (lh / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0); -+ ly += HEIGHT(c) + ih; -+ } else { -+ resize(c, rx, ry, rw - (2*c->bw), (rh / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0); -+ ry += HEIGHT(c) + ih; -+ } -+ } -+ } -+} -+ -+void -+centeredfloatingmaster(Monitor *m) -+{ -+ unsigned int i, n; -+ float mfacts, sfacts; -+ float mivf = 1.0; // master inner vertical gap factor -+ int oh, ov, ih, iv, mrest, srest; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ sh = mh = m->wh - 2*oh; -+ mw = m->ww - 2*ov - iv*(n - 1); -+ sw = m->ww - 2*ov - iv*(n - m->nmaster - 1); -+ -+ if (m->nmaster && n > m->nmaster) { -+ mivf = 0.8; -+ /* go mfact box in the center if more than nmaster clients */ -+ if (m->ww > m->wh) { -+ mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1); -+ mh = m->wh * 0.9; -+ } else { -+ mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1); -+ mh = m->wh * m->mfact; -+ } -+ mx = m->wx + (m->ww - mw) / 2; -+ my = m->wy + (m->wh - mh - 2*oh) / 2; -+ -+ sx = m->wx + ov; -+ sy = m->wy + oh; -+ sh = m->wh - 2*oh; -+ } -+ -+ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -+ if (i < m->nmaster) { -+ /* nmaster clients are stacked horizontally, in the center of the screen */ -+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); -+ mx += WIDTH(c) + iv*mivf; -+ } else { -+ /* stack clients are stacked horizontally */ -+ resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); -+ sx += WIDTH(c) + iv; -+ } -+} -+ -+/* -+ * Deck layout + gaps -+ * https://dwm.suckless.org/patches/deck/ -+ */ -+void -+deck(Monitor *m) -+{ -+ unsigned int i, n; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ float mfacts, sfacts; -+ int mrest, srest; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); -+ sw = mw = m->ww - 2*ov; -+ -+ if (m->nmaster && n > m->nmaster) { -+ sw = (mw - iv) * (1 - m->mfact); -+ mw = mw - iv - sw; -+ sx = mx + mw + iv; -+ sh = m->wh - 2*oh; -+ } -+ -+ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); -+ -+ if (n - m->nmaster > 0) /* override layout symbol */ -+ snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster); -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -+ if (i < m->nmaster) { -+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); -+ my += HEIGHT(c) + ih; -+ } else { -+ resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0); -+ } -+} -+ -+/* -+ * Fibonacci layout + gaps -+ * https://dwm.suckless.org/patches/fibonacci/ -+ */ -+void -+fibonacci(Monitor *m, int s) -+{ -+ unsigned int i, n; -+ int nx, ny, nw, nh; -+ int oh, ov, ih, iv; -+ int nv, hrest = 0, wrest = 0, r = 1; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ nx = m->wx + ov; -+ ny = m->wy + oh; -+ nw = m->ww - 2*ov; -+ nh = m->wh - 2*oh; -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { -+ if (r) { -+ if ((i % 2 && (nh - ih) / 2 <= (bh + 2*c->bw)) -+ || (!(i % 2) && (nw - iv) / 2 <= (bh + 2*c->bw))) { -+ r = 0; -+ } -+ if (r && i < n - 1) { -+ if (i % 2) { -+ nv = (nh - ih) / 2; -+ hrest = nh - 2*nv - ih; -+ nh = nv; -+ } else { -+ nv = (nw - iv) / 2; -+ wrest = nw - 2*nv - iv; -+ nw = nv; -+ } -+ -+ if ((i % 4) == 2 && !s) -+ nx += nw + iv; -+ else if ((i % 4) == 3 && !s) -+ ny += nh + ih; -+ } -+ -+ if ((i % 4) == 0) { -+ if (s) { -+ ny += nh + ih; -+ nh += hrest; -+ } -+ else { -+ nh -= hrest; -+ ny -= nh + ih; -+ } -+ } -+ else if ((i % 4) == 1) { -+ nx += nw + iv; -+ nw += wrest; -+ } -+ else if ((i % 4) == 2) { -+ ny += nh + ih; -+ nh += hrest; -+ if (i < n - 1) -+ nw += wrest; -+ } -+ else if ((i % 4) == 3) { -+ if (s) { -+ nx += nw + iv; -+ nw -= wrest; -+ } else { -+ nw -= wrest; -+ nx -= nw + iv; -+ nh += hrest; -+ } -+ } -+ if (i == 0) { -+ if (n != 1) { -+ nw = (m->ww - iv - 2*ov) - (m->ww - iv - 2*ov) * (1 - m->mfact); -+ wrest = 0; -+ } -+ ny = m->wy + oh; -+ } -+ else if (i == 1) -+ nw = m->ww - nw - iv - 2*ov; -+ i++; -+ } -+ -+ resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False); -+ } -+} -+ -+void -+dwindle(Monitor *m) -+{ -+ fibonacci(m, 1); -+} -+ -+void -+spiral(Monitor *m) -+{ -+ fibonacci(m, 0); -+} -+ -+/* -+ * Gappless grid layout + gaps (ironically) -+ * https://dwm.suckless.org/patches/gaplessgrid/ -+ */ -+void -+gaplessgrid(Monitor *m) -+{ -+ unsigned int i, n; -+ int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters -+ int oh, ov, ih, iv; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ /* grid dimensions */ -+ for (cols = 0; cols <= n/2; cols++) -+ if (cols*cols >= n) -+ break; -+ if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */ -+ cols = 2; -+ rows = n/cols; -+ cn = rn = 0; // reset column no, row no, client count -+ -+ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; -+ cw = (m->ww - 2*ov - iv * (cols - 1)) / cols; -+ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; -+ crest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; -+ x = m->wx + ov; -+ y = m->wy + oh; -+ -+ for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) { -+ if (i/rows + 1 > cols - n%cols) { -+ rows = n/cols + 1; -+ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; -+ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; -+ } -+ resize(c, -+ x, -+ y + rn*(ch + ih) + MIN(rn, rrest), -+ cw + (cn < crest ? 1 : 0) - 2*c->bw, -+ ch + (rn < rrest ? 1 : 0) - 2*c->bw, -+ 0); -+ rn++; -+ if (rn >= rows) { -+ rn = 0; -+ x += cw + ih + (cn < crest ? 1 : 0); -+ cn++; -+ } -+ } -+} -+ -+/* -+ * Gridmode layout + gaps -+ * https://dwm.suckless.org/patches/gridmode/ -+ */ -+void -+grid(Monitor *m) -+{ -+ unsigned int i, n; -+ int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows; -+ int oh, ov, ih, iv; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ -+ /* grid dimensions */ -+ for (rows = 0; rows <= n/2; rows++) -+ if (rows*rows >= n) -+ break; -+ cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; -+ -+ /* window geoms (cell height/width) */ -+ ch = (m->wh - 2*oh - ih * (rows - 1)) / (rows ? rows : 1); -+ cw = (m->ww - 2*ov - iv * (cols - 1)) / (cols ? cols : 1); -+ chrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; -+ cwrest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { -+ cc = i / rows; -+ cr = i % rows; -+ cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest); -+ cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest); -+ resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2*c->bw, ch + (cr < chrest ? 1 : 0) - 2*c->bw, False); -+ } -+} -+ -+/* -+ * Horizontal grid layout + gaps -+ * https://dwm.suckless.org/patches/horizgrid/ -+ */ -+void -+horizgrid(Monitor *m) { -+ Client *c; -+ unsigned int n, i; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ int ntop, nbottom = 1; -+ float mfacts, sfacts; -+ int mrest, srest; -+ -+ /* Count windows */ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ if (n <= 2) -+ ntop = n; -+ else { -+ ntop = n / 2; -+ nbottom = n - ntop; -+ } -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ sh = mh = m->wh - 2*oh; -+ sw = mw = m->ww - 2*ov; -+ -+ if (n > ntop) { -+ sh = (mh - ih) / 2; -+ mh = mh - ih - sh; -+ sy = my + mh + ih; -+ mw = m->ww - 2*ov - iv * (ntop - 1); -+ sw = m->ww - 2*ov - iv * (nbottom - 1); -+ } -+ -+ mfacts = ntop; -+ sfacts = nbottom; -+ mrest = mw - (mw / ntop) * ntop; -+ srest = sw - (sw / nbottom) * nbottom; -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -+ if (i < ntop) { -+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); -+ mx += WIDTH(c) + iv; -+ } else { -+ resize(c, sx, sy, (sw / sfacts) + ((i - ntop) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); -+ sx += WIDTH(c) + iv; -+ } -+} -+ -+/* -+ * nrowgrid layout + gaps -+ * https://dwm.suckless.org/patches/nrowgrid/ -+ */ -+void -+nrowgrid(Monitor *m) -+{ -+ unsigned int n; -+ int ri = 0, ci = 0; /* counters */ -+ int oh, ov, ih, iv; /* vanitygap settings */ -+ unsigned int cx, cy, cw, ch; /* client geometry */ -+ unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */ -+ unsigned int cols, rows = m->nmaster + 1; -+ Client *c; -+ -+ /* count clients */ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ -+ /* nothing to do here */ -+ if (n == 0) -+ return; -+ -+ /* force 2 clients to always split vertically */ -+ if (FORCE_VSPLIT && n == 2) -+ rows = 1; -+ -+ /* never allow empty rows */ -+ if (n < rows) -+ rows = n; -+ -+ /* define first row */ -+ cols = n / rows; -+ uc = cols; -+ cy = m->wy + oh; -+ ch = (m->wh - 2*oh - ih*(rows - 1)) / rows; -+ uh = ch; -+ -+ for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) { -+ if (ci == cols) { -+ uw = 0; -+ ci = 0; -+ ri++; -+ -+ /* next row */ -+ cols = (n - uc) / (rows - ri); -+ uc += cols; -+ cy = m->wy + oh + uh + ih; -+ uh += ch + ih; -+ } -+ -+ cx = m->wx + ov + uw; -+ cw = (m->ww - 2*ov - uw) / (cols - ci); -+ uw += cw + iv; -+ -+ resize(c, cx, cy, cw - (2*c->bw), ch - (2*c->bw), 0); -+ } -+} -+ -+/* -+ * Default tile layout + gaps -+ */ -+static void -+tile(Monitor *m) -+{ -+ unsigned int i, n; -+ int oh, ov, ih, iv; -+ int mx = 0, my = 0, mh = 0, mw = 0; -+ int sx = 0, sy = 0, sh = 0, sw = 0; -+ float mfacts, sfacts; -+ int mrest, srest; -+ Client *c; -+ -+ getgaps(m, &oh, &ov, &ih, &iv, &n); -+ if (n == 0) -+ return; -+ -+ sx = mx = m->wx + ov; -+ sy = my = m->wy + oh; -+ mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); -+ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); -+ sw = mw = m->ww - 2*ov; -+ -+ if (m->nmaster && n > m->nmaster) { -+ sw = (mw - iv) * (1 - m->mfact); -+ mw = mw - iv - sw; -+ sx = mx + mw + iv; -+ } -+ -+ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); -+ -+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -+ if (i < m->nmaster) { -+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); -+ my += HEIGHT(c) + ih; -+ } else { -+ resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); -+ sy += HEIGHT(c) + ih; -+ } -+} -\ No newline at end of file --- -2.19.1 - diff --git a/cachyos-dwm-config/dwm-xrdb-6.2.diff b/cachyos-dwm-config/dwm-xrdb-6.2.diff deleted file mode 100644 index 61fbef61..00000000 --- a/cachyos-dwm-config/dwm-xrdb-6.2.diff +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/drw.c b/drw.c -index 8fd1ca4..e4968a0 100644 ---- a/drw.c -+++ b/drw.c -@@ -207,7 +207,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) - /* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ - Clr * --drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) -+drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount) - { - size_t i; - Clr *ret; -diff --git a/drw.h b/drw.h -index 4bcd5ad..42b04ce 100644 ---- a/drw.h -+++ b/drw.h -@@ -39,7 +39,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in - - /* Colorscheme abstraction */ - void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); --Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); -+Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount); - - /* Cursor abstraction */ - Cur *drw_cur_create(Drw *drw, int shape); -diff --git a/dwm.c b/dwm.c -index 4465af1..7fa45c5 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #ifdef XINERAMA - #include -@@ -56,6 +57,21 @@ - #define HEIGHT(X) ((X)->h + 2 * (X)->bw) - #define TAGMASK ((1 << LENGTH(tags)) - 1) - #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) -+#define XRDB_LOAD_COLOR(R,V) if (XrmGetResource(xrdb, R, NULL, &type, &value) == True) { \ -+ if (value.addr != NULL && strnlen(value.addr, 8) == 7 && value.addr[0] == '#') { \ -+ int i = 1; \ -+ for (; i <= 6; i++) { \ -+ if (value.addr[i] < 48) break; \ -+ if (value.addr[i] > 57 && value.addr[i] < 65) break; \ -+ if (value.addr[i] > 70 && value.addr[i] < 97) break; \ -+ if (value.addr[i] > 102) break; \ -+ } \ -+ if (i == 7) { \ -+ strncpy(V, value.addr, 7); \ -+ V[7] = '\0'; \ -+ } \ -+ } \ -+ } - - /* enums */ - enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -@@ -177,6 +193,7 @@ static void grabkeys(void); - static void incnmaster(const Arg *arg); - static void keypress(XEvent *e); - static void killclient(const Arg *arg); -+static void loadxrdb(void); - static void manage(Window w, XWindowAttributes *wa); - static void mappingnotify(XEvent *e); - static void maprequest(XEvent *e); -@@ -232,6 +249,7 @@ static Monitor *wintomon(Window w); - static int xerror(Display *dpy, XErrorEvent *ee); - static int xerrordummy(Display *dpy, XErrorEvent *ee); - static int xerrorstart(Display *dpy, XErrorEvent *ee); -+static void xrdb(const Arg *arg); - static void zoom(const Arg *arg); - - /* variables */ -@@ -1014,6 +1032,37 @@ killclient(const Arg *arg) - } - } - -+void -+loadxrdb() -+{ -+ Display *display; -+ char * resm; -+ XrmDatabase xrdb; -+ char *type; -+ XrmValue value; -+ -+ display = XOpenDisplay(NULL); -+ -+ if (display != NULL) { -+ resm = XResourceManagerString(display); -+ -+ if (resm != NULL) { -+ xrdb = XrmGetStringDatabase(resm); -+ -+ if (xrdb != NULL) { -+ XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor); -+ XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor); -+ XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor); -+ XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor); -+ XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor); -+ XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor); -+ } -+ } -+ } -+ -+ XCloseDisplay(display); -+} -+ - void - manage(Window w, XWindowAttributes *wa) - { -@@ -2110,6 +2159,17 @@ xerrorstart(Display *dpy, XErrorEvent *ee) - return -1; - } - -+void -+xrdb(const Arg *arg) -+{ -+ loadxrdb(); -+ int i; -+ for (i = 0; i < LENGTH(colors); i++) -+ scheme[i] = drw_scm_create(drw, colors[i], 3); -+ focus(NULL); -+ arrange(NULL); -+} -+ - void - zoom(const Arg *arg) - { -@@ -2136,6 +2196,8 @@ main(int argc, char *argv[]) - if (!(dpy = XOpenDisplay(NULL))) - die("dwm: cannot open display"); - checkotherwm(); -+ XrmInitialize(); -+ loadxrdb(); - setup(); - #ifdef __OpenBSD__ - if (pledge("stdio rpath proc exec", NULL) == -1) diff --git a/cachyos-dwm-config/dwm.desktop b/cachyos-dwm-config/dwm.desktop deleted file mode 100644 index b0c33541..00000000 --- a/cachyos-dwm-config/dwm.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dwm -Comment=Dynamic window manager -Exec=dwm -Icon=dwm -Type=XSession diff --git a/cachyos-dwm-config/dwm.install b/cachyos-dwm-config/dwm.install deleted file mode 100644 index 44b50ed8..00000000 --- a/cachyos-dwm-config/dwm.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "-- Edit config.h in dwm's PKGBUILD directory (generally /var/abs/community/dwm/)" - echo "-- and rebuild package if you want to change settings." -} diff --git a/cachyos-emerald-kde/.SRCINFO b/cachyos-emerald-kde/.SRCINFO deleted file mode 100644 index 8fd76f55..00000000 --- a/cachyos-emerald-kde/.SRCINFO +++ /dev/null @@ -1,14 +0,0 @@ -pkgbase = cachyos-emerald-kde-theme-git - pkgdesc = CachyOS Emerald KDE Theme - pkgver = r25.d61d1dd - pkgrel = 1 - url = https://github.com/CachyOS/CachyOS-Emerald-KDE - arch = any - groups = cachyos - license = GPL3 - makedepends = git - optdepends = plasma-desktop: for included plasma theme - source = git+https://github.com/CachyOS/CachyOS-Emerald-KDE.git - sha256sums = SKIP - -pkgname = cachyos-emerald-kde-theme-git diff --git a/cachyos-emerald-kde/PKGBUILD b/cachyos-emerald-kde/PKGBUILD deleted file mode 100644 index 85dd93bd..00000000 --- a/cachyos-emerald-kde/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: Nico - - -pkgname=cachyos-emerald-kde-theme-git -_themeName=cachyos-emerald -_gitname=CachyOS-Emerald-KDE -pkgver=r25.d61d1dd -pkgrel=1 -pkgdesc="CachyOS Emerald KDE Theme" -arch=('any') -url="https://github.com/CachyOS/CachyOS-Emerald-KDE" -license=(GPL-3.0-or-later) -optdepends=('plasma-desktop: for included plasma theme') -makedepends=('git') -groups=(cachyos) -source=("git+${url}.git") -sha256sums=('SKIP') -pkgver() { - cd ${_gitname} - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -package() { - # make folders -# mkdir -p "${pkgdir}/usr/share/aurorae/themes" - mkdir -p "${pkgdir}/usr/share/color-schemes" - mkdir -p "${pkgdir}/usr/share/plasma/desktoptheme" - mkdir -p "${pkgdir}/usr/share/plasma/look-and-feel" -# mkdir -p "${pkgdir}/usr/share/Kvantum" -# mkdir -p "${pkgdir}/usr/share/sddm/themes" - mkdir -p "${pkgdir}/usr/share/wallpapers" - - # aurorae theme -# cp -r "${srcdir}/${_gitname}/aurorae"/* "${pkgdir}/usr/share/aurorae/themes" -# # kvantum theme -# cp -r "${srcdir}/${_gitname}/Kvantum"/* "${pkgdir}/usr/share/Kvantum" - # color scheme - cp -r "${srcdir}/${_gitname}/color-schemes"/* "${pkgdir}/usr/share/color-schemes" - # desktop theme - cp -r "${srcdir}/${_gitname}/plasma/desktoptheme"/${_themeName}* "${pkgdir}/usr/share/plasma/desktoptheme" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-alt" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-dark" - # look and feel - cp -r "${srcdir}/${_gitname}/plasma/look-and-feel"/* "${pkgdir}/usr/share/plasma/look-and-feel" - # wallpaper - cp -r "${srcdir}/${_gitname}/wallpapers"/* "${pkgdir}/usr/share/wallpapers" -# # sddm -# cp -r "${srcdir}/${_gitname}/sddm/${_themeName}" "${pkgdir}/usr/share/sddm/themes" - - # latte -# mkdir -p "$HOME/.config/latte" -# cp -r "${srcdir}/${_gitname}/latte-dock"/* "$HOME/.config/latte" -# printf "%b" "\e[1;33m==> WARNING: \e[0mThe package installed a latte-dock theme which is not deleted on removal. (Located in $HOME/.config/latte)\n" - -} diff --git a/cachyos-iridescent-kde/.SRCINFO b/cachyos-iridescent-kde/.SRCINFO deleted file mode 100644 index c6a159bb..00000000 --- a/cachyos-iridescent-kde/.SRCINFO +++ /dev/null @@ -1,13 +0,0 @@ -pkgbase = cachyos-emerald-kde-theme-git - pkgdesc = CachyOS Emerald KDE Theme - pkgver = r4.229fc5c - pkgrel = 1 - url = https://gitea.cachyos.org/CachyOS/cachyos-emerald-kde - arch = any - license = GPL3 - makedepends = git - optdepends = plasma-desktop: for included plasma theme - source = git+https://gitea.cachyos.org/CachyOS/cachyos-emerald-kde.git - sha256sums = SKIP - -pkgname = cachyos-emerald-kde-theme-git diff --git a/cachyos-iridescent-kde/PKGBUILD b/cachyos-iridescent-kde/PKGBUILD deleted file mode 100644 index e0608b42..00000000 --- a/cachyos-iridescent-kde/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer: Nico - - -pkgname=cachyos-iridescent-kde -_themeName=cachyos-iridescent-kde -_gitname=cachyos-iridescent-kde -_srcname=cachyos-iridescent-kde -pkgver=r2.16aa352 -pkgrel=1 -pkgdesc="CachyOS cachyos-iridescent-kde" -arch=('any') -url="https://github.com/CachyOS/cachyos-iridescent-kde" -license=(GPL-3.0-or-later) -optdepends=('plasma-desktop: for included plasma theme') -makedepends=('git') -source=("git+${url}.git") -sha256sums=('SKIP') -groups=(cachyos) -pkgver() { - cd ${_gitname} - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -package() { - # make folders -# mkdir -p "${pkgdir}/usr/share/aurorae/themes" - mkdir -p "${pkgdir}/usr/share/color-schemes" - mkdir -p "${pkgdir}/usr/share/plasma/desktoptheme" - mkdir -p "${pkgdir}/usr/share/plasma/look-and-feel" -# mkdir -p "${pkgdir}/usr/share/Kvantum" -# mkdir -p "${pkgdir}/usr/share/sddm/themes" -# mkdir -p "${pkgdir}/usr/share/wallpapers" - - # aurorae theme -# cp -r "${srcdir}/${_gitname}/aurorae"/* "${pkgdir}/usr/share/aurorae/themes" -# # kvantum theme -# cp -r "${srcdir}/${_gitname}/Kvantum"/* "${pkgdir}/usr/share/Kvantum" - # color scheme - cp -r "${srcdir}/${_gitname}/color-schemes"/* "${pkgdir}/usr/share/color-schemes" - # desktop theme - cp -r "${srcdir}/${_gitname}/plasma/desktoptheme"/* "${pkgdir}/usr/share/plasma/desktoptheme" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-alt" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-dark" - # look and feel - cp -r "${srcdir}/${_gitname}/plasma/look-and-feel"/ "${pkgdir}/usr/share/plasma/look-and-feel" - # wallpaper - # cp -r "${srcdir}/${_gitname}/wallpapers"/* "${pkgdir}/usr/share/wallpapers" -# # sddm -# cp -r "${srcdir}/${_gitname}/sddm/${_themeName}" "${pkgdir}/usr/share/sddm/themes" - - # latte -# mkdir -p "$HOME/.config/latte" -# cp -r "${srcdir}/${_gitname}/latte-dock"/* "$HOME/.config/latte" -# printf "%b" "\e[1;33m==> WARNING: \e[0mThe package installed a latte-dock theme which is not deleted on removal. (Located in $HOME/.config/latte)\n" - -} diff --git a/cachyos-kofuku/PKGBUILD b/cachyos-kofuku/PKGBUILD deleted file mode 100644 index 3622ef89..00000000 --- a/cachyos-kofuku/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Vladislav Nepogodin - -pkgname=cachyos-kofuku -pkgver=1.0.1 -pkgrel=3 -arch=('any') -url="https://github.com/cachyos/$pkgname" -license=('MIT') -makedepends=('coreutils') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('e59792027eeeee967191dcee55820d1a32fac0b6e2ca37c8a1fbe2dd2b476abad12148ddde3a462f5a3f851a9a1f3f1a349186a33937ce19295c05b1e36720bb') -pkgdesc='Kofuku settings' -depends=('cachyos-zsh-config' - 'ttf-fantasque-nerd' - 'rofi' - 'feh' - 'rxvt-unicode' - 'lightdm-webkit2-greeter' - 'cachyos-picom-config' - 'polybar' - 'sxhkd' - 'deadd-notification-center' - 'ttf-fira-sans') -install=$pkgname.install -provides=('cachyos-desktop-settings') -conflicts=('cachyos-desktop-settings' 'lightdm-webkit2-theme-glorious') - -package() { - install -d $pkgdir/etc - cp -rf $srcdir/$pkgname-$pkgver/etc $pkgdir - install -d $pkgdir/usr - cp -rf $srcdir/$pkgname-$pkgver/usr $pkgdir -} diff --git a/cachyos-kofuku/cachyos-kofuku.install b/cachyos-kofuku/cachyos-kofuku.install deleted file mode 100644 index 51ded8fe..00000000 --- a/cachyos-kofuku/cachyos-kofuku.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - post_upgrade -} - -post_upgrade() { - mkfontscale /usr/share/fonts/TTF /usr/share/fonts/OTF /usr/share/fonts/misc > /dev/null 2>&1 - mkfontdir /usr/share/fonts/TTF /usr/share/fonts/OTF /usr/share/fonts/misc > /dev/null 2>&1 - fc-cache -s >/dev/null - - sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = glorious #\1/g' /etc/lightdm/lightdm-webkit2-greeter.conf - - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -ftq usr/share/icons/hicolor - /bin/sh -c 'dconf update' -} - diff --git a/cachyos-lavender-kde/.SRCINFO b/cachyos-lavender-kde/.SRCINFO deleted file mode 100644 index 2eaf303f..00000000 --- a/cachyos-lavender-kde/.SRCINFO +++ /dev/null @@ -1,15 +0,0 @@ -pkgbase = cachyos-lavender-kde-theme-git - pkgdesc = CachyOS Lavender KDE Theme - pkgver = r7.6279f76 - pkgrel = 1 - url = https://github.com/CachyOS/CachyOS-Lavender-KDE - arch = any - groups = cachyos - license = GPL3 - makedepends = git - optdepends = plasma-desktop: for included plasma theme - optdepends = kvantum - source = git+https://github.com/CachyOS/CachyOS-Lavender-KDE.git - sha256sums = SKIP - -pkgname = cachyos-lavender-kde-theme-git diff --git a/cachyos-lavender-kde/PKGBUILD b/cachyos-lavender-kde/PKGBUILD deleted file mode 100644 index f91bb2cc..00000000 --- a/cachyos-lavender-kde/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer: Nico - - -pkgname=cachyos-lavender-kde-theme-git -_themeName=cachyos-lavender -_gitname=CachyOS-Lavender-KDE -pkgver=r7.6279f76 -pkgrel=1 -pkgdesc="CachyOS Lavender KDE Theme" -arch=('any') -url="https://github.com/CachyOS/CachyOS-Lavender-KDE" -license=(GPL-3.0-or-later) -optdepends=('plasma-desktop: for included plasma theme' - 'kvantum') -makedepends=('git') -groups=(cachyos) -source=("git+${url}.git") -sha256sums=('SKIP') -pkgver() { - cd ${_gitname} - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -package() { - # make folders - mkdir -p "${pkgdir}/usr/share/aurorae/themes" - mkdir -p "${pkgdir}/usr/share/color-schemes" - mkdir -p "${pkgdir}/usr/share/plasma/desktoptheme" - mkdir -p "${pkgdir}/usr/share/plasma/look-and-feel" - mkdir -p "${pkgdir}/usr/share/Kvantum" -# mkdir -p "${pkgdir}/usr/share/sddm/themes" -# mkdir -p "${pkgdir}/usr/share/wallpapers" - - # aurorae theme - cp -r "${srcdir}/${_gitname}/aurorae"/* "${pkgdir}/usr/share/aurorae/themes" -# # kvantum theme - cp -r "${srcdir}/${_gitname}/kvantum"/* "${pkgdir}/usr/share/Kvantum" - # color scheme -# cp -r "${srcdir}/${_gitname}/color-schemes"/* "${pkgdir}/usr/share/color-schemes" - # desktop theme - cp -r "${srcdir}/${_gitname}/plasma/desktoptheme"/* "${pkgdir}/usr/share/plasma/desktoptheme" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-alt" -# cp -r "${srcdir}/${_gitname}/plasma/desktoptheme/icons" "${pkgdir}/usr/share/plasma/desktoptheme/${_themeName}-dark" - # look and feel - cp -r "${srcdir}/${_gitname}/plasma/look-and-feel"/* "${pkgdir}/usr/share/plasma/look-and-feel" - # wallpaper -# cp -r "${srcdir}/${_gitname}/wallpapers"/* "${pkgdir}/usr/share/wallpapers" -# # sddm -# cp -r "${srcdir}/${_gitname}/sddm/${_themeName}" "${pkgdir}/usr/share/sddm/themes" - - # latte -# mkdir -p "$HOME/.config/latte" -# cp -r "${srcdir}/${_gitname}/latte-dock"/* "$HOME/.config/latte" -# printf "%b" "\e[1;33m==> WARNING: \e[0mThe package installed a latte-dock theme which is not deleted on removal. (Located in $HOME/.config/latte)\n" - -} diff --git a/cachyos-st-config/PKGBUILD b/cachyos-st-config/PKGBUILD deleted file mode 100644 index 3a3e4688..00000000 --- a/cachyos-st-config/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Vladislav Nepogodin (vnepogodin) - -pkgname=cachyos-st-config -pkgver=0.8.5 -pkgrel=3 -pkgdesc='CachyOS ST' -arch=('i686' 'x86_64' 'armv7h' 'aarch64') -license=('MIT') -depends=(libxft libxcursor fontconfig harfbuzz ttf-hack ttf-fira-code ttf-jetbrains-mono) -makedepends=('git') -url="https://github.com/cachyos/$pkgname" -_commit=92664bd9598047d9d41558aea2966e7fac4a0c30 -source=(git+$url.git#commit=${_commit}) -sha256sums=('SKIP') -provides=('st') -conflicts=('st') -_sourcedir=cachyos-st-config -_makeopts="--directory=$_sourcedir" - -build() { - make $_makeopts X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 -} - -package() { - local installopts='--mode 0644 -D --target-directory' - local shrdir="$pkgdir/usr/share" - local licdir="$shrdir/licenses/st" - local docdir="$shrdir/doc/st" - make $_makeopts PREFIX=/usr DESTDIR="$pkgdir" install - install $installopts "$licdir" "$_sourcedir/LICENSE" - install $installopts "$docdir" "$_sourcedir/README" - install $installopts "$shrdir/st" "$_sourcedir/st.info" -} diff --git a/dash/PKGBUILD b/dash/PKGBUILD deleted file mode 100644 index ee3254b8..00000000 --- a/dash/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Maintainer: Levente Polyak -# Contributor: Dan McGee - -pkgname=dash -pkgver=0.5.12 -pkgrel=2 -pkgdesc='POSIX compliant shell that aims to be as small as possible' -url='http://gondor.apana.org.au/~herbert/dash/' -arch=('x86_64') -license=('BSD') -depends=('glibc' 'libedit' 'libedit.so') -install=dash.install -source=(https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/${pkgname}-${pkgver}.tar.gz - workload.dash) -sha512sums=('a5d2347465c0bad09a2921ecb55fb4e7fe451d627ed43c1da82b92259b539857c7a7f153dfee73cea4befcbb34388bb3585845148631262dfe6dec87390f049c') -b2sums=('e0751946fa3b6d513901cc98f3f39a48013f624b9a8ffd699e849456604b856866bd6da268560e6ffa9ec5b91976930d830297031804fdcbab82a953720ee973') - -prepare() { - cd ${pkgname}-${pkgver} - autoreconf -fiv -} - -build() { - - export CFLAGS="${CFLAGS} -fprofile-generate -fprofile-update=atomic -fprofile-partial-training" - export CXXFLAGS="${CXXFLAGS} -fprofile-generate -fprofile-update=atomic -fprofile-partial-training" - - cd ${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --mandir=/usr/share/man \ - --exec-prefix="" \ - --with-libedit - make V=1 - - cd .. - ${pkgname}-${pkgver}/src/dash workload.dash - - export CFLAGS="${CFLAGS//-fprofile-generate/}" - export CFLAGS="${CFLAGS//-fprofile-update=atomic/}" - export CXXFLAGS="${CXXFLAGS//-fprofile-generate/}" - export CXXFLAGS="${CXXFLAGS//-fprofile-update=atomic/}" - export CFLAGS="${CFLAGS} -fprofile-use" - - cd ${pkgname}-${pkgver} - make clean - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --mandir=/usr/share/man \ - --exec-prefix="" \ - --with-libedit - make V=1 - -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/dash/dash.install b/dash/dash.install deleted file mode 100644 index 6b04cba3..00000000 --- a/dash/dash.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - grep -q '/bin/dash' etc/shells || echo '/bin/dash' >> etc/shells -} - -post_upgrade() { - post_install -} - -pre_remove() { - sed -i '/^\/bin\/dash/d' etc/shells -} diff --git a/dash/workload.dash b/dash/workload.dash deleted file mode 100644 index 37272fa7..00000000 --- a/dash/workload.dash +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/dash - -# Increase complexity of mathematical computations -calculate_fibonacci() { - n=$1 - if [ $n -le 1 ]; then - echo $n - else - echo $(( $(calculate_fibonacci $((n - 1))) + $(calculate_fibonacci $((n - 2))) )) - fi -} - -# Calculating a larger set of prime numbers -calculate_primes() { - n=$1 - count=0 - number=2 - primes="" - while [ $count -lt $n ]; do - is_prime=1 - for i in $(seq 2 $(expr $number / 2)); do - if [ $(expr $number % $i) -eq 0 ]; then - is_prime=0 - break - fi - done - if [ $is_prime -eq 1 ]; then - primes="$primes $number" - count=$((count + 1)) - fi - number=$((number + 1)) - done - echo $primes -} - -# Simulating heavier data processing -generate_large_data() { - for i in $(seq 1 100000); do - echo $RANDOM - done > large_data.txt -} - -sort_large_data() { - sort -n large_data.txt -o sorted_large_data.txt -} - -filter_large_data() { - awk '{if ($1 % 2 == 0) print}' sorted_large_data.txt > filtered_large_data.txt -} - -# More complex file I/O operations -complex_file_operations() { - echo "Generating large files for I/O operations..." - for i in $(seq 1 10); do - for j in $(seq 1 10000); do - echo "Line $j of file $i" >> "file_${i}.txt" - done - done - - echo "Reading from large files..." - for i in $(seq 1 10); do - while IFS= read -r line; do - echo "/dev/null" - done < "file_${i}.txt" - done -} - -# Main execution starts here -echo "Calculating Fibonacci for 20..." -calculate_fibonacci 20 - -echo "Calculating first 100 prime numbers..." -calculate_primes 100 - -echo "Generating, sorting, and filtering large dataset..." -generate_large_data -sort_large_data -filter_large_data - -echo "Performing complex file write and read operations..." -complex_file_operations - -echo "All tasks completed." diff --git a/dkms/51b7cd3cf769bf792ff813ecd4c9a2cea3d1aa2b.patch b/dkms/51b7cd3cf769bf792ff813ecd4c9a2cea3d1aa2b.patch deleted file mode 100644 index 259f15b0..00000000 --- a/dkms/51b7cd3cf769bf792ff813ecd4c9a2cea3d1aa2b.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 51b7cd3cf769bf792ff813ecd4c9a2cea3d1aa2b Mon Sep 17 00:00:00 2001 -From: ltsdw <44977415+ltsdw@users.noreply.github.com> -Date: Thu, 6 Jun 2024 18:57:20 -0300 -Subject: [PATCH] dkms: fix building against clang and thin/full lto Right now - there's some issues when trying to compile open-gpu-kernel-modules against a - kernel compiled using clang+Thin/Full LTO. Also the script will pick the - wrong version of the strip command, is also necessary to set the OBJCOPY - environment variable. - -Fixes #416. ---- - dkms.in | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/dkms.in b/dkms.in -index 11180db..b2bfa43 100644 ---- a/dkms.in -+++ b/dkms.in -@@ -625,17 +625,11 @@ read_conf() - # Check if clang was used to compile or lld was used to link the kernel. - if [[ -e $kernel_source_dir/vmlinux ]]; then - if readelf -p .comment $kernel_source_dir/vmlinux | grep -q clang; then -- make_command="${make_command} CC=clang" -- fi -- if readelf -p .comment $kernel_source_dir/vmlinux | grep -q LLD; then -- make_command="${make_command} LD=ld.lld" -+ make_command="${make_command} LLVM=1" - fi - elif [[ -e "${kernel_config}" ]]; then - if grep -q CONFIG_CC_IS_CLANG=y "${kernel_config}"; then -- make_command="${make_command} CC=clang" -- fi -- if grep -q CONFIG_LD_IS_LLD=y "${kernel_config}"; then -- make_command="${make_command} LD=ld.lld" -+ make_command="${make_command} LLVM=1" - fi - fi - -@@ -1150,7 +1144,11 @@ actual_build() - local built_module="$the_module$module_uncompressed_suffix" - local compressed_module="$the_module$module_suffix" - -- [[ ${strip[$count]} != no ]] && strip -g "$built_module" -+ if [[ ${strip[$count]} != no ]] && [[ ${CC} == "clang" ]]; then -+ llvm-strip -g "$built_module" -+ elif [[ ${strip[$count]} != no ]]; then -+ strip -g "$built_module" -+ fi - - if (( do_signing )); then - echo "Signing module $built_module" diff --git a/julia/.SRCINFO b/julia/.SRCINFO deleted file mode 100644 index a0838230..00000000 --- a/julia/.SRCINFO +++ /dev/null @@ -1,56 +0,0 @@ -pkgbase = julia - pkgdesc = High-level, high-performance, dynamic programming language - pkgver = 1.10.5 - pkgrel = 2 - epoch = 2 - url = https://julialang.org/ - arch = x86_64 - license = MIT - makedepends = cmake - makedepends = gcc-fortran - makedepends = libwhich - makedepends = llvm-julia - makedepends = patchelf - makedepends = python - makedepends = clang - makedepends = llvm - depends = blas64-openblas - depends = fftw - depends = libblastrampoline - depends = libgit2 - depends = libunwind - depends = libutf8proc - depends = lld - depends = llvm-julia-libs - depends = mbedtls2 - depends = openlibm - depends = p7zip - depends = pcre2 - depends = suitesparse - optdepends = gnuplot: If using the Gaston Package from julia - backup = etc/julia/startup.jl - source = https://github.com/JuliaLang/julia/releases/download/v1.10.5/julia-1.10.5-full.tar.gz - source = https://github.com/JuliaLang/julia/releases/download/v1.10.5/julia-1.10.5-full.tar.gz.asc - source = c12e8515.patch - source = julia-libgit2-1.7.patch::https://github.com/JuliaLang/julia/commit/2c4c068e.patch - source = julia-libgit2-1.8.patch - source = julia-libunwind-1.6.patch - source = julia-libcholmod-cuda.patch - source = julia-suitesparse-7.patch - source = julia-hardcoded-libs.patch - source = https://github.com/JuliaLang/julia/commit/1cddd37d.patch - source = git+https://github.com/JuliaLang/Microbenchmarks.git - validpgpkeys = 3673DF529D9049477F76B37566E3C7DC03D6E495 - sha256sums = 5fc94159b87f34d18bf44a1a940e59f40cbeab931bfdc0c4763203bbb6995260 - sha256sums = SKIP - sha256sums = 2cc294b63e601d50341979fb936826bdba59de2165a5929eae927e152652f367 - sha256sums = b533dd999f019258cbcae1563f18715f41e42e0786b681150cb2c28f8a0da963 - sha256sums = dc541120600e9c0574016a2738461ddb99be21fc8f763d4a3152169fd2f3bf54 - sha256sums = 3c0c03eabb668e3242fcd3058c1011dfbb579cc1c5adc3ae1016531e711cc64e - sha256sums = f69afd7db3fabe4b747afa2404e1202c1dcfe0f8c5fe5238e424eea737fa2a23 - sha256sums = 0fd1a0c1fcbe7f583139ed3a4a87f77963f06876d69058fa3ffbedfaec609ee7 - sha256sums = 02f0ae518dfd50c2b3abf95fa760de85298baf79d80c2f6f48ac182e58a736d7 - sha256sums = fb0156e313fb58ea1ffca2d77f0ed677b6ab8895015203be7429981a877e1702 - sha256sums = SKIP - -pkgname = julia diff --git a/julia/.nvchecker.toml b/julia/.nvchecker.toml deleted file mode 100644 index d0fec3e8..00000000 --- a/julia/.nvchecker.toml +++ /dev/null @@ -1,5 +0,0 @@ -[julia] -source = 'github' -github = 'JuliaLang/julia' -use_latest_release = true -prefix = 'v' diff --git a/julia/1cddd37d.patch b/julia/1cddd37d.patch deleted file mode 100644 index a5b67379..00000000 --- a/julia/1cddd37d.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1cddd37daaac97fab344e36078ce5aa9e14f573e Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Thu, 6 Jun 2024 11:04:51 +0200 -Subject: [PATCH] Intall appdata to non-deprecated path - -See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 34f239fcbaa17..3232ac2450033 100644 ---- a/Makefile -+++ b/Makefile -@@ -396,8 +396,8 @@ endif - mkdir -p $(DESTDIR)$(datarootdir)/applications/ - $(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/ - # Install appdata file -- mkdir -p $(DESTDIR)$(datarootdir)/appdata/ -- $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/ -+ mkdir -p $(DESTDIR)$(datarootdir)/metainfo/ -+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/metainfo/ - - # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel) - ifneq ($(private_libdir_rel),$(build_private_libdir_rel)) diff --git a/julia/PKGBUILD b/julia/PKGBUILD deleted file mode 100644 index 135b13e5..00000000 --- a/julia/PKGBUILD +++ /dev/null @@ -1,212 +0,0 @@ -# Maintainer: Antonio Rojas -# Contributor: Alexander F. Rødseth -# Contributor: Eli Schwartz -# Contributor: Lex Black -# Contributor: Michael Jakl -# Contributor: devmotion -# Contributor: Valentin Churavy - -# Julia-PGO PKGBUILD -# Maintainer: Laio Seman -# using PGO-LTO script from https://github.com/JuliaLang/julia/pull/45641#issue-1268010204 - -pkgname=julia -epoch=2 -pkgver=1.10.5 -pkgrel=2 -arch=(x86_64) -pkgdesc='High-level, high-performance, dynamic programming language' -url='https://julialang.org/' -license=(MIT) -depends=(blas64-openblas - fftw - libblastrampoline - libgit2 - libunwind - libutf8proc - lld - llvm-julia-libs - mbedtls2 - openlibm - p7zip - pcre2 - suitesparse) -makedepends=(cmake - gcc-fortran - libwhich - llvm-julia - patchelf - python - clang - llvm) -optdepends=('gnuplot: If using the Gaston Package from julia') -source=(https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz{,.asc} - c12e8515.patch - julia-libgit2-1.7.patch::https://github.com/JuliaLang/julia/commit/2c4c068e.patch - julia-libgit2-1.8.patch - julia-libunwind-1.6.patch - julia-libcholmod-cuda.patch - julia-suitesparse-7.patch - julia-hardcoded-libs.patch - https://github.com/JuliaLang/julia/commit/1cddd37d.patch - git+https://github.com/JuliaLang/Microbenchmarks.git) -backup=(etc/julia/startup.jl) -sha256sums=('5fc94159b87f34d18bf44a1a940e59f40cbeab931bfdc0c4763203bbb6995260' - 'SKIP' - '2cc294b63e601d50341979fb936826bdba59de2165a5929eae927e152652f367' - 'b533dd999f019258cbcae1563f18715f41e42e0786b681150cb2c28f8a0da963' - 'dc541120600e9c0574016a2738461ddb99be21fc8f763d4a3152169fd2f3bf54' - '3c0c03eabb668e3242fcd3058c1011dfbb579cc1c5adc3ae1016531e711cc64e' - 'f69afd7db3fabe4b747afa2404e1202c1dcfe0f8c5fe5238e424eea737fa2a23' - '0fd1a0c1fcbe7f583139ed3a4a87f77963f06876d69058fa3ffbedfaec609ee7' - '02f0ae518dfd50c2b3abf95fa760de85298baf79d80c2f6f48ac182e58a736d7' - 'fb0156e313fb58ea1ffca2d77f0ed677b6ab8895015203be7429981a877e1702' - 'SKIP') -validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) - -prepare() { - cd $pkgname-$pkgver - -# libunwind 1.6 compatibility - patch -p1 -i ../julia-libunwind-1.6.patch -# Update metadata install path - patch -p1 -i ../1cddd37d.patch -# Revert test that depends on patched gmp - patch -Rp1 -i ../c12e8515.patch -# Harmless test failure, needs investigation - sed -e '/int.jl/d' -i test/cmdlineargs.jl -# libgit2 1.8 compatibility - patch -p1 -i ../julia-libgit2-1.7.patch - patch -p1 -i ../julia-libgit2-1.8.patch -# Don't use libcholmod-cuda - patch -p1 -i ../julia-libcholmod-cuda.patch -# Don't hardcode library names - patch -p1 -i ../julia-hardcoded-libs.patch -# Fix warnings with suitesparse 7 - cd stdlib/srccache - _SAsha=279b363ca8d3129d4742903d37c8b11545fa08a2 - tar -xzf SparseArrays-$_SAsha.tar.gz - patch -d JuliaSparse-SparseArrays.jl-${_SAsha:0:7} -p1 < "$srcdir"/julia-suitesparse-7.patch - rm SparseArrays-$_SAsha.tar.gz - tar -czf SparseArrays-$_SAsha.tar.gz JuliaSparse-SparseArrays.jl-${_SAsha:0:7} - md5sum SparseArrays-$_SAsha.tar.gz | cut -d ' ' -f 1 > ../../deps/checksums/SparseArrays-$_SAsha.tar.gz/md5 - sha512sum SparseArrays-$_SAsha.tar.gz | cut -d ' ' -f 1 > ../../deps/checksums/SparseArrays-$_SAsha.tar.gz/sha512 - - mkdir -p ${srcdir}/${pkgname}-${pkgver}/pgo-lto -} - -_make() { - local make_options=( - prefix=/usr - bindir=/usr/bin - sysconfdir=/etc - libexecdir=/usr/lib - USE_BINARYBUILDER=0 - USE_SYSTEM_CSL=1 - USE_SYSTEM_LLVM=1 - USE_SYSTEM_LLD=1 - USE_SYSTEM_LIBUNWIND=1 - USE_SYSTEM_PCRE=1 - USE_SYSTEM_BLAS=1 - USE_SYSTEM_LAPACK=1 - USE_SYSTEM_LIBBLASTRAMPOLINE=1 - USE_SYSTEM_GMP=1 - USE_SYSTEM_MPFR=1 - USE_SYSTEM_LIBSUITESPARSE=1 - USE_SYSTEM_LIBWHICH=1 - USE_SYSTEM_DSFMT=0 - USE_SYSTEM_LIBUV=0 - USE_SYSTEM_UTF8PROC=1 - USE_SYSTEM_LIBGIT2=1 - USE_SYSTEM_LIBSSH2=1 - USE_SYSTEM_MBEDTLS=1 - USE_SYSTEM_CURL=1 - USE_SYSTEM_PATCHELF=1 - USE_SYSTEM_ZLIB=1 - USE_SYSTEM_P7ZIP=1 - USE_SYSTEM_OPENLIBM=1 - USE_BLAS64=1 - LIBBLAS=-lblas64 - LIBBLASNAME=libblas64 - LIBLAPACK=-llapack64 - LIBLAPACKNAME=liblapack64 - MARCH=x86-64 - VERBOSE=1 - JLDFLAGS="$LDFLAGS" - LLVM_CONFIG=/usr/lib/llvm-julia/bin/llvm-config - ) - - LD_LIBRARY_PATH="/usr/lib/mbedtls2" make "${make_options[@]}" "$@" -} - -build() { - export PROFILE_FILE=$(pwd)/profile.profraw - export ROOT_DIR=$(pwd) - cd $pkgname-$pkgver - export JULIA_BUILD_DIR=$(pwd) - - export STAGE1=${srcdir}/${pkgname}-${pkgver}/pgo-lto/stage1.build - export STAGE2=${srcdir}/${pkgname}-${pkgver}/pgo-lto/stage2.build - export CC=clang - export CXX=clang++ - - rm -rf $STAGE1 - rm -rf $STAGE2 - mkdir -p $STAGE1 - mkdir -p $STAGE2 - - # Set PGO flags - export COUNTERS_PER_SITE=6 - export PROFILE_DIR=${PWD}/profiles - rm -rf $PROFILE_DIR - mkdir -p $PROFILE_DIR - - export PGO_CFLAGS=" -fprofile-generate=${PROFILE_DIR} -mllvm -vp-counters-per-site=${COUNTERS_PER_SITE}" - export PGO_CXXFLAGS=" -fprofile-generate=${PROFILE_DIR} -mllvm -vp-counters-per-site=${COUNTERS_PER_SITE}" - - # backup original flags - export CFLAGS_ORIG=$CFLAGS - export CXXFLAGS_ORIG=$CXXFLAGS - - # Append PGO flags - export CFLAGS="${CFLAGS} ${PGO_CFLAGS}" - export CXXFLAGS="${CXXFLAGS} ${PGO_CXXFLAGS}" - - _make O=$STAGE1 configure - _make -C $STAGE1 - - # Clean profile dir - rm -rf $PROFILE_DIR - mkdir -p $PROFILE_DIR - - cd $ROOT_DIR/Microbenchmarks - LLVM_PROFILE_FILE=${PROFILE_DIR}/_%m_%p.profraw $STAGE1/julia perf.jl - LLVM_PROFILE_FILE=${PROFILE_DIR}/_%m_%p.profraw $STAGE1/julia perf.jl - LLVM_PROFILE_FILE=${PROFILE_DIR}/_%m_%p.profraw $STAGE1/julia perf.jl - cd .. - - # Build stage 2 - export PGO_CFLAGS="-fprofile-use=${PROFILE_FILE}" - export PGO_CXXFLAGS="-fprofile-use=${PROFILE_FILE}" - - llvm-profdata merge -output=${PROFILE_FILE} ${PROFILE_DIR}/*.profraw - - export CFLAGS="${CFLAGS_ORIG} ${PGO_CFLAGS}" - export CXXFLAGS="${CXXFLAGS_ORIG} ${PGO_CXXFLAGS}" - - cd $JULIA_BUILD_DIR - _make O=$STAGE2 configure - _make -C $STAGE2 -} - -package() { - export STAGE2_DONE=${srcdir}/${pkgname}-${pkgver}/pgo-lto/stage2.build - cd $STAGE2_DONE - _make DESTDIR="$pkgdir" install - - ln -sf /etc/ssl/cert.pem "$STAGE2_DONE"/usr/share/julia # Needed by some packages - - rm -f "$STAGE2_DONE"/usr/lib/julia/libccalltest.so.debug # Remove debug testing library - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE.md -t "$STAGE2_DONE"/usr/share/licenses/$pkgname - -} diff --git a/julia/c12e8515.patch b/julia/c12e8515.patch deleted file mode 100644 index 29e5b34e..00000000 --- a/julia/c12e8515.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/test/gmp.jl b/test/gmp.jl -index 8f6be13c38054..6efc349ca2ba1 100644 ---- a/test/gmp.jl -+++ b/test/gmp.jl -@@ -11,6 +11,11 @@ ee = typemax(Int64) - @test BigInt <: Signed - @test big(1) isa Signed - -+ if sizeof(Culong) >= 8 -+ @test_throws OutOfMemoryError big(96608869069402268615522366320733234710)^16374500563449903721 -+ @test_throws OutOfMemoryError 555555555555555555555555555555555555555555555555555^55555555555555555 -+ end -+ - let x = big(1) - @test signed(x) === x - @test convert(Signed, x) === x diff --git a/julia/julia-hardcoded-libs.patch b/julia/julia-hardcoded-libs.patch deleted file mode 100644 index 8fd89f48..00000000 --- a/julia/julia-hardcoded-libs.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -index 8b98c76ac5..77ad9e3800 100644 ---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl -+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libnghttp2 = "@rpath/libnghttp2.14.dylib" - else -- const libnghttp2 = "libnghttp2.so.14" -+ const libnghttp2 = "libnghttp2.so" - end - - function __init__() -diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -index f0d4b5dda6..2ed3017b51 100644 ---- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl -+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libgit2 = "@rpath/libgit2.1.6.dylib" - else -- const libgit2 = "libgit2.so.1.6" -+ const libgit2 = "libgit2.so" - end - - function __init__() -diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -index 215de8aed6..918d1ffdc2 100644 ---- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libopenlibm = "@rpath/libopenlibm.4.dylib" - else -- const libopenlibm = "libopenlibm.so.4" -+ const libopenlibm = "libopenlibm.so" - end - - function __init__() -diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl -index 2940970cef..359dbd9065 100644 ---- a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl -+++ b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl -@@ -67,18 +67,18 @@ elseif Sys.isapple() - const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib" - const libumfpack = "@rpath/libumfpack.5.dylib" - else -- const libamd = "libamd.so.3" -- const libbtf = "libbtf.so.2" -- const libcamd = "libcamd.so.3" -- const libccolamd = "libccolamd.so.3" -- const libcholmod = "libcholmod.so.4" -- const libcolamd = "libcolamd.so.3" -- const libklu = "libklu.so.2" -- const libldl = "libldl.so.3" -- const librbio = "librbio.so.4" -- const libspqr = "libspqr.so.4" -- const libsuitesparseconfig = "libsuitesparseconfig.so.7" -- const libumfpack = "libumfpack.so.6" -+ const libamd = "libamd.so" -+ const libbtf = "libbtf.so" -+ const libcamd = "libcamd.so" -+ const libccolamd = "libccolamd.so" -+ const libcholmod = "libcholmod.so" -+ const libcolamd = "libcolamd.so" -+ const libklu = "libklu.so" -+ const libldl = "libldl.so" -+ const librbio = "librbio.so" -+ const libspqr = "libspqr.so" -+ const libsuitesparseconfig = "libsuitesparseconfig.so" -+ const libumfpack = "libumfpack.so" - end - - function __init__() diff --git a/julia/julia-libcholmod-cuda.patch b/julia/julia-libcholmod-cuda.patch deleted file mode 100644 index cc2bbf41..00000000 --- a/julia/julia-libcholmod-cuda.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1565014a0f..5e9b4ccf54 100644 ---- a/Makefile -+++ b/Makefile -@@ -196,7 +196,7 @@ else ifeq ($(JULIA_BUILD_MODE),debug) - JL_PRIVATE_LIBS-0 += libjulia-internal-debug libjulia-codegen-debug - endif - ifeq ($(USE_GPL_LIBS), 1) --JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcholmod_cuda libcolamd libklu libldl librbio libspqr libspqr_cuda libsuitesparseconfig libumfpack -+JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcolamd libklu libldl librbio libspqr libsuitesparseconfig libumfpack - endif - JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBBLASTRAMPOLINE) += libblastrampoline - JL_PRIVATE_LIBS-$(USE_SYSTEM_PCRE) += libpcre2-8 -diff --git a/base/Makefile b/base/Makefile -index ad2bb6a63c..493302af78 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -269,11 +269,9 @@ $(eval $(call symlink_system_library,LIBSUITESPARSE,libamd)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libcamd)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libccolamd)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod)) --$(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod_cuda)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libcolamd)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libumfpack)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr)) --$(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr_cuda)) - $(eval $(call symlink_system_library,LIBSUITESPARSE,libsuitesparseconfig)) - # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen): - # libunwind diff --git a/julia/julia-libgit2-1.7.patch b/julia/julia-libgit2-1.7.patch deleted file mode 100644 index 67d51da2..00000000 --- a/julia/julia-libgit2-1.7.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 2c4c068e58fd3b42cad2c093d81a9eefb6846e3a Mon Sep 17 00:00:00 2001 -From: Yichao Yu -Date: Sun, 10 Sep 2023 14:07:57 -0400 -Subject: [PATCH] libgit2 1.7.0 support - ---- - stdlib/LibGit2/src/consts.jl | 65 ++++++++++++++++++++++++++++-------- - stdlib/LibGit2/src/error.jl | 7 ++-- - stdlib/LibGit2/src/types.jl | 8 ++++- - 3 files changed, 64 insertions(+), 16 deletions(-) - -diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl -index f3a460108db6b..9db0f19b46ab3 100644 ---- a/stdlib/LibGit2/src/consts.jl -+++ b/stdlib/LibGit2/src/consts.jl -@@ -341,6 +341,10 @@ const LIBSSH2_KNOWNHOST_CHECK_MISMATCH = 1 - const LIBSSH2_KNOWNHOST_CHECK_NOTFOUND = 2 - const LIBSSH2_KNOWNHOST_CHECK_FAILURE = 3 - -+# Constants for fetch depth (shallowness of fetch). -+const FETCH_DEPTH_FULL = 0 -+const FETCH_DEPTH_UNSHALLOW = 2147483647 -+ - @enum(GIT_SUBMODULE_IGNORE, SUBMODULE_IGNORE_UNSPECIFIED = -1, # use the submodule's configuration - SUBMODULE_IGNORE_NONE = 1, # any change or untracked == dirty - SUBMODULE_IGNORE_UNTRACKED = 2, # dirty if tracked files change -@@ -432,19 +436,49 @@ Global library options. - - These are used to select which global option to set or get and are used in `git_libgit2_opts()`. - """ --@enum(GIT_OPT, GET_MWINDOW_SIZE = 0, -- SET_MWINDOW_SIZE = 1, -- GET_MWINDOW_MAPPED_LIMIT = 2, -- SET_MWINDOW_MAPPED_LIMIT = 3, -- GET_SEARCH_PATH = 4, -- SET_SEARCH_PATH = 5, -- SET_CACHE_OBJECT_LIMIT = 6, -- SET_CACHE_MAX_SIZE = 7, -- ENABLE_CACHING = 8, -- GET_CACHED_MEMORY = 9, -- GET_TEMPLATE_PATH = 10, -- SET_TEMPLATE_PATH = 11, -- SET_SSL_CERT_LOCATIONS = 12) -+@enum(GIT_OPT, GET_MWINDOW_SIZE = 0, -+ SET_MWINDOW_SIZE, -+ GET_MWINDOW_MAPPED_LIMIT, -+ SET_MWINDOW_MAPPED_LIMIT, -+ GET_SEARCH_PATH, -+ SET_SEARCH_PATH, -+ SET_CACHE_OBJECT_LIMIT, -+ SET_CACHE_MAX_SIZE, -+ ENABLE_CACHING, -+ GET_CACHED_MEMORY, -+ GET_TEMPLATE_PATH, -+ SET_TEMPLATE_PATH, -+ SET_SSL_CERT_LOCATIONS, -+ SET_USER_AGENT, -+ ENABLE_STRICT_OBJECT_CREATION, -+ ENABLE_STRICT_SYMBOLIC_REF_CREATION, -+ SET_SSL_CIPHERS, -+ GET_USER_AGENT, -+ ENABLE_OFS_DELTA, -+ ENABLE_FSYNC_GITDIR, -+ GET_WINDOWS_SHAREMODE, -+ SET_WINDOWS_SHAREMODE, -+ ENABLE_STRICT_HASH_VERIFICATION, -+ SET_ALLOCATOR, -+ ENABLE_UNSAVED_INDEX_SAFETY, -+ GET_PACK_MAX_OBJECTS, -+ SET_PACK_MAX_OBJECTS, -+ DISABLE_PACK_KEEP_FILE_CHECKS, -+ ENABLE_HTTP_EXPECT_CONTINUE, -+ GET_MWINDOW_FILE_LIMIT, -+ SET_MWINDOW_FILE_LIMIT, -+ SET_ODB_PACKED_PRIORITY, -+ SET_ODB_LOOSE_PRIORITY, -+ GET_EXTENSIONS, -+ SET_EXTENSIONS, -+ GET_OWNER_VALIDATION, -+ SET_OWNER_VALIDATION, -+ GET_HOMEDIR, -+ SET_HOMEDIR, -+ SET_SERVER_CONNECT_TIMEOUT, -+ GET_SERVER_CONNECT_TIMEOUT, -+ SET_SERVER_TIMEOUT, -+ GET_SERVER_TIMEOUT) - - """ - Option flags for `GitProxy`. -@@ -468,4 +502,9 @@ Option flags for `GitProxy`. - TRACE_TRACE - end - -+# The type of object id -+@enum(GIT_OID_TYPE, -+ OID_DEFAULT = 0, -+ OID_SHA1 = 1) -+ - end -diff --git a/stdlib/LibGit2/src/error.jl b/stdlib/LibGit2/src/error.jl -index fd70ed8ce5706..1a493006ea1b5 100644 ---- a/stdlib/LibGit2/src/error.jl -+++ b/stdlib/LibGit2/src/error.jl -@@ -33,7 +33,8 @@ export GitError - EMISMATCH = Cint(-33), # hashsum mismatch in object - EINDEXDIRTY = Cint(-34), # unsaved changes in the index would be overwritten - EAPPLYFAIL = Cint(-35), # patch application failed -- EOWNER = Cint(-36)) # the object is not owned by the current user -+ EOWNER = Cint(-36), # the object is not owned by the current user -+ TIMEOUT = Cint(-37)) # The operation timed out - - @enum(Class, None, - NoMemory, -@@ -69,7 +70,9 @@ export GitError - Patch, - WorkTree, - SHA1, -- HTTP) -+ HTTP, -+ Internal, -+ Grafts) - - struct ErrorStruct - message::Ptr{UInt8} -diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl -index 6af95b894f1ca..25163b1db343d 100644 ---- a/stdlib/LibGit2/src/types.jl -+++ b/stdlib/LibGit2/src/types.jl -@@ -2,7 +2,7 @@ - - using Base: something - import Base.@kwdef --import .Consts: GIT_SUBMODULE_IGNORE, GIT_MERGE_FILE_FAVOR, GIT_MERGE_FILE, GIT_CONFIG -+import .Consts: GIT_SUBMODULE_IGNORE, GIT_MERGE_FILE_FAVOR, GIT_MERGE_FILE, GIT_CONFIG, GIT_OID_TYPE - - const OID_RAWSZ = 20 - const OID_HEXSZ = OID_RAWSZ * 2 -@@ -346,6 +346,9 @@ The fields represent: - @static if LibGit2.VERSION >= v"0.25.0" - proxy_opts::ProxyOptions = ProxyOptions() - end -+ @static if LibGit2.VERSION >= v"1.7.0" -+ depth::Cuint = Cuint(Consts.FETCH_DEPTH_FULL) -+ end - @static if LibGit2.VERSION >= v"1.4.0" - follow_redirects::Cuint = Cuint(0) - end -@@ -439,6 +442,9 @@ The fields represent: - # options controlling how the diff text is generated - context_lines::UInt32 = UInt32(3) - interhunk_lines::UInt32 = UInt32(0) -+ @static if LibGit2.VERSION >= v"1.7.0" -+ oid_type::GIT_OID_TYPE = Consts.OID_DEFAULT -+ end - id_abbrev::UInt16 = UInt16(7) - max_size::Int64 = Int64(512*1024*1024) #512Mb - old_prefix::Cstring = Cstring(C_NULL) diff --git a/julia/julia-libgit2-1.8.patch b/julia/julia-libgit2-1.8.patch deleted file mode 100644 index e25badcc..00000000 --- a/julia/julia-libgit2-1.8.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl -index 5a5b8b74e7127..8c140e8c2aa30 100644 ---- a/stdlib/LibGit2/src/consts.jl -+++ b/stdlib/LibGit2/src/consts.jl -@@ -417,7 +417,32 @@ Option flags for `GitRepo`. - FEATURE_SSH = Cuint(1 << 2), - FEATURE_NSEC = Cuint(1 << 3)) - --if version() >= v"0.24.0" -+if version() >= v"1.8.0" -+ @doc """ -+ Priority level of a config file. -+ -+ These priority levels correspond to the natural escalation logic (from higher to lower) when searching for config entries in git. -+ -+ * `CONFIG_LEVEL_DEFAULT` - Open the global, XDG and system configuration files if any available. -+ * `CONFIG_LEVEL_PROGRAMDATA` - System-wide on Windows, for compatibility with portable git -+ * `CONFIG_LEVEL_SYSTEM` - System-wide configuration file; `/etc/gitconfig` on Linux systems -+ * `CONFIG_LEVEL_XDG` - XDG compatible configuration file; typically `~/.config/git/config` -+ * `CONFIG_LEVEL_GLOBAL` - User-specific configuration file (also called Global configuration file); typically `~/.gitconfig` -+ * `CONFIG_LEVEL_LOCAL` - Repository specific configuration file; `\$WORK_DIR/.git/config` on non-bare repos -+ * `CONFIG_LEVEL_WORKTREE` - Worktree specific configuration file; `\$GIT_DIR/config.worktree` -+ * `CONFIG_LEVEL_APP` - Application specific configuration file; freely defined by applications -+ * `CONFIG_HIGHEST_LEVEL` - Represents the highest level available config file (i.e. the most specific config file available that actually is loaded) -+ """ -+ @enum(GIT_CONFIG, CONFIG_LEVEL_DEFAULT = 0, -+ CONFIG_LEVEL_PROGRAMDATA = 1, -+ CONFIG_LEVEL_SYSTEM = 2, -+ CONFIG_LEVEL_XDG = 3, -+ CONFIG_LEVEL_GLOBAL = 4, -+ CONFIG_LEVEL_LOCAL = 5, -+ CONFIG_LEVEL_WORKTREE = 6, -+ CONFIG_LEVEL_APP = 7, -+ CONFIG_HIGHEST_LEVEL =-1) -+elseif version() >= v"0.24.0" - @doc """ - Priority level of a config file. - -diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl -index 96cea96d013e5..b0b463c69e2f1 100644 ---- a/stdlib/LibGit2/src/types.jl -+++ b/stdlib/LibGit2/src/types.jl -@@ -678,6 +678,8 @@ The fields represent: - for more information. - * `custom_headers`: only relevant if the LibGit2 version is greater than or equal to `0.24.0`. - Extra headers needed for the push operation. -+ * `remote_push_options`: only relevant if the LibGit2 version is greater than or equal to `1.8.0`. -+ "Push options" to deliver to the remote. - """ - @kwdef struct PushOptions - version::Cuint = Cuint(1) -@@ -692,6 +694,9 @@ The fields represent: - @static if LibGit2.VERSION >= v"0.24.0" - custom_headers::StrArrayStruct = StrArrayStruct() - end -+ @static if LibGit2.VERSION >= v"1.8.0" -+ remote_push_options::StrArrayStruct = StrArrayStruct() -+ end - end - @assert Base.allocatedinline(PushOptions) - -@@ -913,10 +918,17 @@ Matches the [`git_config_entry`](https://libgit2.org/libgit2/#HEAD/type/git_conf - struct ConfigEntry - name::Cstring - value::Cstring -+ @static if LibGit2.VERSION >= v"1.8.0" -+ backend_type::Cstring -+ origin_path::Cstring -+ end - include_depth::Cuint - level::GIT_CONFIG - free::Ptr{Cvoid} -- payload::Ptr{Cvoid} # User is not permitted to read or write this field -+ @static if LibGit2.VERSION < v"1.8.0" -+ # In 1.8.0, the unused payload value has been removed -+ payload::Ptr{Cvoid} -+ end - end - @assert Base.allocatedinline(ConfigEntry) - diff --git a/julia/julia-libunwind-1.6.patch b/julia/julia-libunwind-1.6.patch deleted file mode 100644 index cb2102da..00000000 --- a/julia/julia-libunwind-1.6.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp -index 95b562311b..69fceb0cfe 100644 ---- a/src/debuginfo.cpp -+++ b/src/debuginfo.cpp -@@ -265,6 +265,7 @@ public: - di->format = UNW_INFO_FORMAT_ARM_EXIDX; - di->start_ip = (uintptr_t)arm_text_addr; - di->end_ip = (uintptr_t)(arm_text_addr + arm_text_len); -+ di->load_offset = 0; - di->u.rti.name_ptr = 0; - di->u.rti.table_data = arm_exidx_addr; - di->u.rti.table_len = arm_exidx_len; -@@ -1577,6 +1578,7 @@ void register_eh_frames(uint8_t *Addr, size_t Size) - di->u.rti.table_data = (unw_word_t)table; - di->start_ip = start_ip; - di->end_ip = end_ip; -+ di->load_offset = 0; - - jl_profile_atomic([&]() { - _U_dyn_register(di); diff --git a/julia/julia-suitesparse-7.patch b/julia/julia-suitesparse-7.patch deleted file mode 100644 index c79090bb..00000000 --- a/julia/julia-suitesparse-7.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/solvers/cholmod.jl.orig 2022-11-11 07:24:15.860939080 +0000 -+++ b/src/solvers/cholmod.jl 2022-11-11 07:24:39.462357069 +0000 -@@ -194,21 +194,6 @@ - from www.julialang.org, which ship with the correct - versions of all dependencies. - """ -- elseif BUILD_VERSION.major != current_version.major -- @warn """ -- CHOLMOD version incompatibility -- -- Julia was compiled with CHOLMOD version $BUILD_VERSION. It is -- currently linked with version $current_version. -- This might cause Julia to terminate when working with -- sparse matrix factorizations, e.g. solving systems of -- equations with \\. -- -- It is recommended that you use Julia with the same major -- version of CHOLMOD as the one used during the build, or -- download the generic binaries from www.julialang.org, -- which ship with the correct versions of all dependencies. -- """ - end - - intsize = sizeof(SuiteSparse_long) diff --git a/python-pytorch/.SRCINFO b/python-pytorch/.SRCINFO deleted file mode 100644 index d9b50fa6..00000000 --- a/python-pytorch/.SRCINFO +++ /dev/null @@ -1,302 +0,0 @@ -pkgbase = python-pytorch - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration - pkgver = 2.2.1 - pkgrel = 1 - url = https://pytorch.org - arch = x86_64 - license = BSD - makedepends = python - makedepends = python-setuptools - makedepends = python-yaml - makedepends = python-numpy - makedepends = cmake - makedepends = cuda - makedepends = nccl - makedepends = cudnn - makedepends = git - makedepends = rocm-hip-sdk - makedepends = roctracer - makedepends = miopen - makedepends = magma-cuda - makedepends = magma-hip - makedepends = ninja - makedepends = pkgconfig - makedepends = doxygen - makedepends = vulkan-headers - makedepends = shaderc - makedepends = onednn - depends = google-glog - depends = gflags - depends = opencv - depends = openmp - depends = openmpi - depends = pybind11 - depends = python - depends = python-yaml - depends = libuv - depends = python-numpy - depends = python-sympy - depends = protobuf - depends = ffmpeg - depends = python-future - depends = qt6-base - depends = intel-oneapi-mkl - depends = python-typing_extensions - depends = numactl - depends = python-jinja - depends = python-networkx - depends = python-filelock - options = !lto - options = !debug - source = pytorch::git+https://github.com/pytorch/pytorch.git#tag=v2.2.1 - source = python-pytorch-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git - source = python-pytorch-FP16::git+https://github.com/Maratyszcza/FP16.git - source = python-pytorch-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git - source = python-pytorch-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git - source = python-pytorch-PeachPy::git+https://github.com/malfet/PeachPy.git - source = python-pytorch-QNNPACK::git+https://github.com/pytorch/QNNPACK - source = python-pytorch-VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git - source = python-pytorch-XNNPACK::git+https://github.com/google/XNNPACK.git - source = python-pytorch-benchmark::git+https://github.com/google/benchmark.git - source = python-pytorch-cpuinfo::git+https://github.com/pytorch/cpuinfo.git - source = python-pytorch-cub::git+https://github.com/NVlabs/cub.git - source = python-pytorch-cudnn-frontend::git+https://github.com/NVIDIA/cudnn-frontend.git - source = python-pytorch-cutlass::git+https://github.com/NVIDIA/cutlass.git - source = python-pytorch-eigen::git+https://gitlab.com/libeigen/eigen.git - source = python-pytorch-fbgemm::git+https://github.com/pytorch/fbgemm - source = python-pytorch-fbjni::git+https://github.com/facebookincubator/fbjni.git - source = python-pytorch-flatbuffers::git+https://github.com/google/flatbuffers.git - source = python-pytorch-fmt::git+https://github.com/fmtlib/fmt.git - source = python-pytorch-foxi::git+https://github.com/houseroad/foxi.git - source = python-pytorch-gemmlowp::git+https://github.com/google/gemmlowp.git - source = python-pytorch-gloo::git+https://github.com/facebookincubator/gloo - source = python-pytorch-googletest::git+https://github.com/google/googletest.git - source = python-pytorch-ideep::git+https://github.com/intel/ideep - source = python-pytorch-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git - source = python-pytorch-ittapi::git+https://github.com/intel/ittapi.git - source = python-pytorch-json::git+https://github.com/nlohmann/json.git - source = python-pytorch-kineto::git+https://github.com/pytorch/kineto - source = python-pytorch-mimalloc::git+https://github.com/microsoft/mimalloc.git - source = python-pytorch-nccl::git+https://github.com/NVIDIA/nccl - source = python-pytorch-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt - source = python-pytorch-onnx::git+https://github.com/onnx/onnx.git - source = python-pytorch-pocketfft::git+https://github.com/mreineck/pocketfft - source = python-pytorch-protobuf::git+https://github.com/protocolbuffers/protobuf.git - source = python-pytorch-psimd::git+https://github.com/Maratyszcza/psimd.git - source = python-pytorch-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git - source = python-pytorch-pybind11::git+https://github.com/pybind/pybind11.git - source = python-pytorch-sleef::git+https://github.com/shibatch/sleef - source = python-pytorch-tbb::git+https://github.com/01org/tbb - source = python-pytorch-tensorpipe::git+https://github.com/pytorch/tensorpipe.git - source = python-pytorch-zstd::git+https://github.com/facebook/zstd.git - source = python-pytorch-2_2_0-fix-cccl-build.patch::https://github.com/pytorch/pytorch/commit/2a440348958b3f0a2b09458bd76fe5959b371c0c.patch - source = python-pytorch-fix-cuda-12_4.patch - source = fix_include_system.patch - source = use-system-libuv.patch - source = fix-building-for-torchvision.patch - source = 87773.patch - source = disable-werror1.patch - source = disable-werror2.patch - source = disable-werror4.patch - source = rocblas-batched.patch - source = protobuf-23.patch - source = glog-0.7.patch - source = pytorch-rocm-jit.patch - source = pytorch-missing-iostream.patch - source = python-pytorch-ffmpeg6.patch - source = python-pytorch-rocm-6.patch - source = python-pytorch-goo-rocm-6.patch - source = pytorch-remove-caffe2-binaries.patch - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = SKIP - b2sums = ae31599abcfde4d7dcf20d5430cbdab46d1c74b342c088883d6c949fad1987cbd16520d8f1d887b669c0990aae4baf4f0c350eeadbf237abf3a8e8a122722f3e - b2sums = caf22a33fab6ca909cc9325ed6c32fdf36189dbdc77bb921d7db88fb5228f33ca2d90b1368b5ef88624277be422eaeb395768f9f2ddca19f39a238ed3c40efbd - b2sums = 77f85808e480bd37dfb5f072d565466ae30a8f827f49ef97591fc2fc03bea54944eb1adeaa4a1e3466518a5640f575eda88d15b4c4d549a6f41f0bf4f2cfb086 - b2sums = af8c724ed80898ae3875a295ad6bd4d18d90f8a9124f6cff6d1b2f525bf7806fe61306e739c1f7362fbd8d0e4f8ba57d0e3bf925ea3f7a78a0a98f26722db147 - b2sums = fdea0b815d7750a4233c1d4668593020da017aea43cf4cb63b4c00d0852c7d34f0333e618fcf98b8df2185313a2089b8c2e9fe8ec3cfb0bf693598f9c61461a8 - b2sums = 0a8fc110a306e81beeb9ddfb3a1ddfd26aeda5e3f7adfb0f7c9bc3fd999c2dde62e0b407d3eca573097a53fd97329214e30e8767fb38d770197c7ec2b53daf18 - b2sums = 844d0b7b39777492a6d456fa845d5399f673b4bb37b62473393449c9ad0c29dca3c33276dc3980f2e766680100335c0acfb69d51781b79575f4da112d9c4018c - b2sums = 985e331b2025e1ca5a4fba5188af0900f1f38bd0fd32c9173deb8bed7358af01e387d4654c7e0389e5f98b6f7cbed053226934d180b8b3b1270bdbbb36fc89b2 - b2sums = eea86bbed0a37e1661035913536456f90e0cd1e687c7e4103011f0688bc8347b6fc2ff82019909c41e7c89ddbc3b80dde641e88abf406f4faebc71b0bb693d25 - b2sums = 232d2aca7cae8da511d1451890f8696d47da72276929ac5731a1a1a481d2a515fa7288bf33730d8ea2c892616551a74ca2439b53de6b1dfee156c30919120741 - b2sums = 738199e7a11940c839a43ac4e3152d84e15b9cde638227d3d87ecb45f82c5e76630a56c49bcfb08e841f92be1b2311f2fad4fafdcc17f5b00b7a8ef6d962f250 - b2sums = 20d044c5c80354af5ed63847fa4332e96cbfc32a351788f6458fb92b322de7f64b10c188ff26e4f34e422cfe30e082c3ca23ee3e9094616c142aa53588dd451e - b2sums = e19fbb32da5a3bdd9d1505b2ba79ff0d765b241da819c96a380a5c871be4f5a78dcad000e01a315d936cfebb7860150f8111e60aed17cbb9337896a0831df0fe - b2sums = 77458fa568692020ae4e437b1ebae6ebbf59f040b3414ba03e32cc829f1befb9f39dde6e0c0525e30d42dd08d482d2f213dd8294a9877476c7d0d6aabb0f08d3 - b2sums = c17c2d2c085795861cb46974e8e251a0eb576c35a1dd2d75bcb880119bcc800c49bf6bc25c8f671c984b48787b5b919ef946352e299dc13d3ff763ae1bcc33a4 - b2sums = 6cf1cf6a636cf42b0fad6c4475f941e95a7a18cbd17fbab63576619fc3849213ff4fb0190b25e63d3438d7dbd259b3afb80e12a59d6b025edb02d576bff7b864 - b2sums = da7184d166270b59efb83105d19c0de6c9fe8c386e66807ac93e65761410ac5a91a2305f92022262a32cf5cf31bbcc08bb3f7975dd6063dda2408195aa3fe475 - b2sums = 21e9922ed1c0b555316a655067a789ef81a93b173e35446ecd2d06d976d49ad6b4a0aaa7339fd647758e821c15bec7ffda3d6e4804c8e858a888f0171cd2a9cb - -pkgname = python-pytorch - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration - -pkgname = python-pytorch-opt - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration (with AVX2 CPU optimizations) - provides = python-pytorch=2.2.1 - conflicts = python-pytorch - -pkgname = python-pytorch-cuda - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA) - depends = google-glog - depends = gflags - depends = opencv - depends = openmp - depends = openmpi - depends = pybind11 - depends = python - depends = python-yaml - depends = libuv - depends = python-numpy - depends = python-sympy - depends = protobuf - depends = ffmpeg - depends = python-future - depends = qt6-base - depends = intel-oneapi-mkl - depends = python-typing_extensions - depends = numactl - depends = python-jinja - depends = python-networkx - depends = python-filelock - depends = cuda - depends = nccl - depends = cudnn - depends = magma-cuda - depends = onednn - provides = python-pytorch=2.2.1 - conflicts = python-pytorch - -pkgname = python-pytorch-opt-cuda - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA and AVX2 CPU optimizations) - depends = google-glog - depends = gflags - depends = opencv - depends = openmp - depends = openmpi - depends = pybind11 - depends = python - depends = python-yaml - depends = libuv - depends = python-numpy - depends = python-sympy - depends = protobuf - depends = ffmpeg - depends = python-future - depends = qt6-base - depends = intel-oneapi-mkl - depends = python-typing_extensions - depends = numactl - depends = python-jinja - depends = python-networkx - depends = python-filelock - depends = cuda - depends = nccl - depends = cudnn - depends = magma-cuda - depends = onednn - provides = python-pytorch=2.2.1 - provides = python-pytorch-cuda=2.2.1 - conflicts = python-pytorch - -pkgname = python-pytorch-rocm - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration (with ROCm) - depends = google-glog - depends = gflags - depends = opencv - depends = openmp - depends = openmpi - depends = pybind11 - depends = python - depends = python-yaml - depends = libuv - depends = python-numpy - depends = python-sympy - depends = protobuf - depends = ffmpeg - depends = python-future - depends = qt6-base - depends = intel-oneapi-mkl - depends = python-typing_extensions - depends = numactl - depends = python-jinja - depends = python-networkx - depends = python-filelock - depends = rocm-hip-sdk - depends = roctracer - depends = miopen - depends = magma-hip - depends = onednn - provides = python-pytorch=2.2.1 - conflicts = python-pytorch - -pkgname = python-pytorch-opt-rocm - pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU acceleration (with ROCm and AVX2 CPU optimizations) - depends = google-glog - depends = gflags - depends = opencv - depends = openmp - depends = openmpi - depends = pybind11 - depends = python - depends = python-yaml - depends = libuv - depends = python-numpy - depends = python-sympy - depends = protobuf - depends = ffmpeg - depends = python-future - depends = qt6-base - depends = intel-oneapi-mkl - depends = python-typing_extensions - depends = numactl - depends = python-jinja - depends = python-networkx - depends = python-filelock - depends = rocm-hip-sdk - depends = roctracer - depends = miopen - depends = magma-hip - depends = onednn - provides = python-pytorch=2.2.1 - provides = python-pytorch-rocm=2.2.1 - conflicts = python-pytorch diff --git a/python-pytorch/87773.patch b/python-pytorch/87773.patch deleted file mode 100644 index b598e08d..00000000 --- a/python-pytorch/87773.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 94465d6287e8f54c99f4b0b891a6c618bb80d7ce Mon Sep 17 00:00:00 2001 -From: Arfrever Frehtes Taifersar Arahesis -Date: Wed, 26 Oct 2022 07:32:59 +0200 -Subject: [PATCH] Support only GLog >=0.6.0 - -Fixes https://github.com/pytorch/pytorch/issues/58054 ---- - c10/util/Logging.cpp | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp -index fe74e49548646..d8fce12ce4840 100644 ---- a/c10/util/Logging.cpp -+++ b/c10/util/Logging.cpp -@@ -192,23 +192,13 @@ C10_DEFINE_int( - google::GLOG_WARNING, - "The minimum log level that caffe2 will output."); - --// Google glog's api does not have an external function that allows one to check --// if glog is initialized or not. It does have an internal function - so we are --// declaring it here. This is a hack but has been used by a bunch of others too --// (e.g. Torch). --namespace google { --namespace glog_internal_namespace_ { --bool IsGoogleLoggingInitialized(); --} // namespace glog_internal_namespace_ --} // namespace google -- - namespace c10 { - namespace { - - void initGoogleLogging(char const* name) { - #if !defined(_MSC_VER) - // This trick can only be used on UNIX platforms -- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) -+ if (!::google::IsGoogleLoggingInitialized()) - #endif - { - ::google::InitGoogleLogging(name); diff --git a/python-pytorch/PKGBUILD b/python-pytorch/PKGBUILD deleted file mode 100644 index c0cf34d2..00000000 --- a/python-pytorch/PKGBUILD +++ /dev/null @@ -1,357 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Maintainer: Torsten Keßler -# Contributor: Stephen Zhang - -_pkgname=pytorch -pkgbase="python-${_pkgname}" -pkgname=( "${pkgbase}-avx512-cuda") -pkgver=2.2.0 -_pkgver=2.2.0 -pkgrel=4 -_pkgdesc='Tensors and Dynamic neural networks in Python with strong GPU acceleration' -pkgdesc="${_pkgdesc}" -arch=('x86_64') -url="https://pytorch.org" -license=('BSD') -depends=('google-glog' 'gflags' 'opencv' 'openmp' 'openmpi' 'pybind11' 'python' 'python-yaml' 'libuv' - 'python-numpy' 'python-sympy' 'protobuf' 'ffmpeg' 'python-future' 'qt6-base' - 'intel-oneapi-mkl' 'python-typing_extensions' 'numactl' 'python-jinja' - 'python-networkx' 'python-filelock') -makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' - 'nccl' 'cudnn' 'git' 'magma-cuda' - 'ninja' 'pkgconfig' 'doxygen' 'vulkan-headers' 'shaderc' 'onednn') -source=("${_pkgname}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver" - # generated using parse-submodules - "${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git" - "${pkgname}-FP16::git+https://github.com/Maratyszcza/FP16.git" - "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git" - "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git" - "${pkgname}-PeachPy::git+https://github.com/malfet/PeachPy.git" - "${pkgname}-QNNPACK::git+https://github.com/pytorch/QNNPACK" - "${pkgname}-VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - "${pkgname}-XNNPACK::git+https://github.com/google/XNNPACK.git" - "${pkgname}-benchmark::git+https://github.com/google/benchmark.git" - "${pkgname}-cpuinfo::git+https://github.com/pytorch/cpuinfo.git" - "${pkgname}-cub::git+https://github.com/NVlabs/cub.git" - "${pkgname}-cudnn-frontend::git+https://github.com/NVIDIA/cudnn-frontend.git" - "${pkgname}-cutlass::git+https://github.com/NVIDIA/cutlass.git" - "${pkgname}-eigen::git+https://gitlab.com/libeigen/eigen.git" - "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm" - "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git" - "${pkgname}-flatbuffers::git+https://github.com/google/flatbuffers.git" - "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git" - "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git" - "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git" - "${pkgname}-gloo::git+https://github.com/facebookincubator/gloo" - "${pkgname}-googletest::git+https://github.com/google/googletest.git" - "${pkgname}-ideep::git+https://github.com/intel/ideep" - "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git" - "${pkgname}-ittapi::git+https://github.com/intel/ittapi.git" - "${pkgname}-json::git+https://github.com/nlohmann/json.git" - "${pkgname}-kineto::git+https://github.com/pytorch/kineto" - "${pkgname}-mimalloc::git+https://github.com/microsoft/mimalloc.git" - "${pkgname}-nccl::git+https://github.com/NVIDIA/nccl" - "${pkgname}-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt" - "${pkgname}-onnx::git+https://github.com/onnx/onnx.git" - "${pkgname}-pocketfft::git+https://github.com/mreineck/pocketfft" - "${pkgname}-protobuf::git+https://github.com/protocolbuffers/protobuf.git" - "${pkgname}-psimd::git+https://github.com/Maratyszcza/psimd.git" - "${pkgname}-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git" - "${pkgname}-pybind11::git+https://github.com/pybind/pybind11.git" - "${pkgname}-sleef::git+https://github.com/shibatch/sleef" - "${pkgname}-tbb::git+https://github.com/01org/tbb" - "${pkgname}-tensorpipe::git+https://github.com/pytorch/tensorpipe.git" - "${pkgname}-zstd::git+https://github.com/facebook/zstd.git" - "python-pytorch-2_2_0-fix-cccl-build.patch::https://github.com/pytorch/pytorch/commit/2a440348958b3f0a2b09458bd76fe5959b371c0c.patch" - python-pytorch-fix-cuda-12_4.patch - fix_include_system.patch - use-system-libuv.patch - fix-building-for-torchvision.patch - 87773.patch - disable-werror1.patch - disable-werror2.patch - disable-werror4.patch - rocblas-batched.patch - protobuf-23.patch - glog-0.7.patch - pytorch-rocm-jit.patch - pytorch-missing-iostream.patch - python-pytorch-ffmpeg6.patch - python-pytorch-rocm-6.patch - python-pytorch-goo-rocm-6.patch - pytorch-remove-caffe2-binaries.patch) -b2sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'ae31599abcfde4d7dcf20d5430cbdab46d1c74b342c088883d6c949fad1987cbd16520d8f1d887b669c0990aae4baf4f0c350eeadbf237abf3a8e8a122722f3e' - 'caf22a33fab6ca909cc9325ed6c32fdf36189dbdc77bb921d7db88fb5228f33ca2d90b1368b5ef88624277be422eaeb395768f9f2ddca19f39a238ed3c40efbd' - '77f85808e480bd37dfb5f072d565466ae30a8f827f49ef97591fc2fc03bea54944eb1adeaa4a1e3466518a5640f575eda88d15b4c4d549a6f41f0bf4f2cfb086' - 'af8c724ed80898ae3875a295ad6bd4d18d90f8a9124f6cff6d1b2f525bf7806fe61306e739c1f7362fbd8d0e4f8ba57d0e3bf925ea3f7a78a0a98f26722db147' - 'fdea0b815d7750a4233c1d4668593020da017aea43cf4cb63b4c00d0852c7d34f0333e618fcf98b8df2185313a2089b8c2e9fe8ec3cfb0bf693598f9c61461a8' - '0a8fc110a306e81beeb9ddfb3a1ddfd26aeda5e3f7adfb0f7c9bc3fd999c2dde62e0b407d3eca573097a53fd97329214e30e8767fb38d770197c7ec2b53daf18' - '844d0b7b39777492a6d456fa845d5399f673b4bb37b62473393449c9ad0c29dca3c33276dc3980f2e766680100335c0acfb69d51781b79575f4da112d9c4018c' - '985e331b2025e1ca5a4fba5188af0900f1f38bd0fd32c9173deb8bed7358af01e387d4654c7e0389e5f98b6f7cbed053226934d180b8b3b1270bdbbb36fc89b2' - 'eea86bbed0a37e1661035913536456f90e0cd1e687c7e4103011f0688bc8347b6fc2ff82019909c41e7c89ddbc3b80dde641e88abf406f4faebc71b0bb693d25' - '232d2aca7cae8da511d1451890f8696d47da72276929ac5731a1a1a481d2a515fa7288bf33730d8ea2c892616551a74ca2439b53de6b1dfee156c30919120741' - '738199e7a11940c839a43ac4e3152d84e15b9cde638227d3d87ecb45f82c5e76630a56c49bcfb08e841f92be1b2311f2fad4fafdcc17f5b00b7a8ef6d962f250' - '20d044c5c80354af5ed63847fa4332e96cbfc32a351788f6458fb92b322de7f64b10c188ff26e4f34e422cfe30e082c3ca23ee3e9094616c142aa53588dd451e' - 'e19fbb32da5a3bdd9d1505b2ba79ff0d765b241da819c96a380a5c871be4f5a78dcad000e01a315d936cfebb7860150f8111e60aed17cbb9337896a0831df0fe' - '77458fa568692020ae4e437b1ebae6ebbf59f040b3414ba03e32cc829f1befb9f39dde6e0c0525e30d42dd08d482d2f213dd8294a9877476c7d0d6aabb0f08d3' - 'c17c2d2c085795861cb46974e8e251a0eb576c35a1dd2d75bcb880119bcc800c49bf6bc25c8f671c984b48787b5b919ef946352e299dc13d3ff763ae1bcc33a4' - '6cf1cf6a636cf42b0fad6c4475f941e95a7a18cbd17fbab63576619fc3849213ff4fb0190b25e63d3438d7dbd259b3afb80e12a59d6b025edb02d576bff7b864' - 'da7184d166270b59efb83105d19c0de6c9fe8c386e66807ac93e65761410ac5a91a2305f92022262a32cf5cf31bbcc08bb3f7975dd6063dda2408195aa3fe475' - '21e9922ed1c0b555316a655067a789ef81a93b173e35446ecd2d06d976d49ad6b4a0aaa7339fd647758e821c15bec7ffda3d6e4804c8e858a888f0171cd2a9cb') -options=('!lto' '!debug') - -get_pyver () { - python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' -} - -prepare() { - cd "${srcdir}/${_pkgname}" - - # generated using parse-submodules - git submodule init - - git config submodule."android/libs/fbjni".url "${srcdir}/${pkgname}"-fbjni - git config submodule."third_party/NNPACK".url "${srcdir}/${pkgname}"-NNPACK - git config submodule."third_party/NNPACK_deps/FP16".url "${srcdir}/${pkgname}"-FP16 - git config submodule."third_party/NNPACK_deps/FXdiv".url "${srcdir}/${pkgname}"-FXdiv - git config submodule."third_party/NNPACK_deps/psimd".url "${srcdir}/${pkgname}"-psimd - git config submodule."third_party/NNPACK_deps/pthreadpool".url "${srcdir}/${pkgname}"-pthreadpool - git config submodule."third_party/QNNPACK".url "${srcdir}/${pkgname}"-QNNPACK - git config submodule."third_party/VulkanMemoryAllocator".url "${srcdir}/${pkgname}"-VulkanMemoryAllocator - git config submodule."third_party/XNNPACK".url "${srcdir}/${pkgname}"-XNNPACK - git config submodule."third_party/benchmark".url "${srcdir}/${pkgname}"-benchmark - git config submodule."third_party/cpuinfo".url "${srcdir}/${pkgname}"-cpuinfo - git config submodule."third_party/cub".url "${srcdir}/${pkgname}"-cub - git config submodule."third_party/cudnn_frontend".url "${srcdir}/${pkgname}"-cudnn-frontend - git config submodule."third_party/cutlass".url "${srcdir}/${pkgname}"-cutlass - git config submodule."third_party/eigen".url "${srcdir}/${pkgname}"-eigen - git config submodule."third_party/fbgemm".url "${srcdir}/${pkgname}"-fbgemm - git config submodule."third_party/flatbuffers".url "${srcdir}/${pkgname}"-flatbuffers - git config submodule."third_party/fmt".url "${srcdir}/${pkgname}"-fmt - git config submodule."third_party/foxi".url "${srcdir}/${pkgname}"-foxi - git config submodule."third_party/gemmlowp/gemmlowp".url "${srcdir}/${pkgname}"-gemmlowp - git config submodule."third_party/gloo".url "${srcdir}/${pkgname}"-gloo - git config submodule."third_party/googletest".url "${srcdir}/${pkgname}"-googletest - git config submodule."third_party/ideep".url "${srcdir}/${pkgname}"-ideep - git config submodule."third_party/ios-cmake".url "${srcdir}/${pkgname}"-ios-cmake - git config submodule."third_party/ittapi".url "${srcdir}/${pkgname}"-ittapi - git config submodule."third_party/kineto".url "${srcdir}/${pkgname}"-kineto - git config submodule."third_party/mimalloc".url "${srcdir}/${pkgname}"-mimalloc - git config submodule."third_party/nccl/nccl".url "${srcdir}/${pkgname}"-nccl - git config submodule."third_party/neon2sse".url "${srcdir}/${pkgname}"-ARM_NEON_2_x86_SSE - git config submodule."third_party/nlohmann".url "${srcdir}/${pkgname}"-json - git config submodule."third_party/onnx".url "${srcdir}/${pkgname}"-onnx - git config submodule."third_party/onnx-tensorrt".url "${srcdir}/${pkgname}"-onnx-tensorrt - git config submodule."third_party/pocketfft".url "${srcdir}/${pkgname}"-pocketfft - git config submodule."third_party/protobuf".url "${srcdir}/${pkgname}"-protobuf - git config submodule."third_party/pybind11".url "${srcdir}/${pkgname}"-pybind11 - git config submodule."third_party/python-peachpy".url "${srcdir}/${pkgname}"-PeachPy - git config submodule."third_party/sleef".url "${srcdir}/${pkgname}"-sleef - git config submodule."third_party/tbb".url "${srcdir}/${pkgname}"-tbb - git config submodule."third_party/tensorpipe".url "${srcdir}/${pkgname}"-tensorpipe - git config submodule."third_party/zstd".url "${srcdir}/${pkgname}"-zstd - - git -c protocol.file.allow=always submodule update --init --recursive - - # Fix cmake prefix path (FS#78665) - sed -i "s|cmake_prefix_path = _osp.*|cmake_prefix_path = '/usr/lib/cmake'|g" torch/utils/__init__.py - - # https://bugs.archlinux.org/task/64981 - patch -N torch/utils/cpp_extension.py "${srcdir}"/fix_include_system.patch - - # Use system libuv - patch -Np1 -i "${srcdir}"/use-system-libuv.patch - - # fix https://github.com/pytorch/vision/issues/3695 - patch -Np1 -i "${srcdir}/fix-building-for-torchvision.patch" - - # Fix building against glog 0.6 - patch -Np1 -i "${srcdir}/87773.patch" - - # Fix building against glog 0.7 - patch -p1 -i "${srcdir}/glog-0.7.patch" - - # Disable -Werror - patch -Np1 -d third_party/fbgemm -i "${srcdir}/disable-werror1.patch" - patch -Np1 -d third_party/benchmark -i "${srcdir}/disable-werror2.patch" - patch -Np1 -i "${srcdir}/disable-werror4.patch" - - # fix https://github.com/pytorch/pytorch/issues/97640 - patch -Np1 -i "${srcdir}/rocblas-batched.patch" - - # protobuf 23 requires C++17 - find -name CMakeLists.txt | xargs sed -e 's|CXX_STANDARD 14|CXX_STANDARD 17|' -e 's|CXX_STANDARD 11|CXX_STANDARD 17|' -i - # Promote bool and {u,i}nit8 types to 16 bit as 8 bit types throw an exception in protobuf/abseil, - # https://github.com/protocolbuffers/protobuf/blob/92619cdd433c5eed314d6b871060ac2340f52906/src/google/protobuf/repeated_field.h#L122-L129 - patch -Np1 -i "${srcdir}/protobuf-23.patch" - - patch -Np1 -i "${srcdir}/pytorch-missing-iostream.patch" - - # build against ffmpeg 6 - patch -Np1 -i "${srcdir}/python-pytorch-ffmpeg6.patch" - - patch -Np1 -i "${srcdir}/python-pytorch-rocm-6.patch" - patch -Np1 -d third_party/gloo -i "${srcdir}/python-pytorch-goo-rocm-6.patch" - - patch -Np1 -i "${srcdir}/pytorch-remove-caffe2-binaries.patch" - - # https://github.com/pytorch/pytorch/issues/122169 - patch -Np1 -i "${srcdir}/python-pytorch-2_2_0-fix-cccl-build.patch" - - patch -Np1 -i "${srcdir}/python-pytorch-fix-cuda-12_4.patch" - - cd "${srcdir}" - - cp -r "${_pkgname}" "${_pkgname}-avx512-cuda" -} - -# Common build configuration, called in all package() functions. -_prepare() { - export VERBOSE=1 - export PYTORCH_BUILD_VERSION="${pkgver}" - export PYTORCH_BUILD_NUMBER=1 - - # Check tools/setup_helpers/cmake.py, setup.py and CMakeLists.txt for a list of flags that can be set via env vars. - export ATEN_NO_TEST=ON # do not build ATen tests - export USE_MKLDNN=ON - export BUILD_CUSTOM_PROTOBUF=OFF - # Caffe2 support was removed from pytorch with version 2.2.0 - export BUILD_CAFFE2=OFF - export BUILD_CAFFE2_OPS=OFF - # export BUILD_SHARED_LIBS=OFF - export USE_FFMPEG=ON - export USE_GFLAGS=ON - export USE_GLOG=ON - export USE_VULKAN=ON - export BUILD_BINARY=ON - export USE_OBSERVERS=ON - export USE_OPENCV=ON - # export USE_SYSTEM_LIBS=ON # experimental, not all libs present in repos - export USE_SYSTEM_NCCL=ON - export NCCL_VERSION=$(pkg-config nccl --modversion) - export NCCL_VER_CODE=$(sed -n 's/^#define NCCL_VERSION_CODE\s*\(.*\).*/\1/p' /usr/include/nccl.h) - # export BUILD_SPLIT_CUDA=ON # modern preferred build, but splits libs and symbols, ABI break - # export USE_FAST_NVCC=ON # parallel build with nvcc, spawns too many processes - export USE_CUPTI_SO=ON # make sure cupti.so is used as shared lib - export CC=/usr/bin/gcc - export CXX=/usr/bin/g++ - export CUDAHOSTCXX=/opt/cuda/bin/g++ - export CUDA_HOST_COMPILER="${CUDAHOSTCXX}" - export CUDA_HOME=/opt/cuda - # hide build-time CUDA devices - export CUDA_VISIBLE_DEVICES="" - export CUDNN_LIB_DIR=/usr/lib - export CUDNN_INCLUDE_DIR=/usr/include - export TORCH_NVCC_FLAGS="-Xfatbin -compress-all" - # CUDA arch 8.7 is not supported (needed by Jetson boards, etc.) - export TORCH_CUDA_ARCH_LIST="5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5;8.0;8.6;8.9;9.0;9.0+PTX" #include latest PTX for future compat - export OVERRIDE_TORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST}" - export ROCM_PATH=/opt/rocm - export HIP_ROOT_DIR=/opt/rocm - export PYTORCH_ROCM_ARCH="gfx906;gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" - # Compile source code for supported GPU archs in parallel - export HIPCC_COMPILE_FLAGS_APPEND="-parallel-jobs=$(nproc)" - export HIPCC_LINK_FLAGS_APPEND="-parallel-jobs=$(nproc)" -} - -build() { - cd "${srcdir}/${_pkgname}" - echo "Building without cuda or rocm and without non-x86-64 optimizations" - _prepare - - cd "${srcdir}/${_pkgname}-avx512-cuda" - echo "Building with cuda and with avx512 optimizations" - export USE_CUDA=1 - export USE_CUDNN=1 - export USE_ROCM=0 - export MAGMA_HOME=/opt/cuda/targets/x86_64-linux - _prepare - echo "add_definitions(-march=x86-64-v4)" >> cmake/MiscCheck.cmake - # same horrible hack as above - python setup.py build || python setup.py build - -} - -_package() { - # Prevent setup.py from re-running CMake and rebuilding - sed -e 's/RUN_BUILD_DEPS = True/RUN_BUILD_DEPS = False/g' -i setup.py - - python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - pytorchpath="usr/lib/python$(get_pyver)/site-packages/torch" - install -d "${pkgdir}/usr/lib" - - # put CMake files in correct place - mv "${pkgdir}/${pytorchpath}/share/cmake" "${pkgdir}/usr/lib/cmake" - - # put C++ API in correct place - mv "${pkgdir}/${pytorchpath}/include" "${pkgdir}/usr/include" - find "${pkgdir}/${pytorchpath}"/lib/ -type f,l \( -iname '*.so' -or -iname '*.so*' \) -print0 | while read -rd $'\0' _lib; do - mv "${_lib}" "${pkgdir}"/usr/lib/ - done - - # clean up duplicates - rm -r "${pkgdir}/usr/include/pybind11" - rm "${pkgdir}"/usr/include/*.h - - # Python module is hardcoded so look there at runtime - ln -s /usr/include "${pkgdir}/${pytorchpath}/include" - find "${pkgdir}"/usr/lib -maxdepth 1 -type f,l \( -iname '*.so' -or -iname '*.so*' \) -print0 | while read -rd $'\0' _lib; do - ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/" - done -} - -package_python-pytorch-avx512-cuda() { - pkgdesc="${_pkgdesc} (with CUDA and AVX512 CPU optimizations)" - depends+=(cuda nccl cudnn magma-cuda onednn) - conflicts=(python-pytorch) - provides=(python-pytorch=${pkgver} python-pytorch-cuda=${pkgver}) - - cd "${srcdir}/${_pkgname}-avx512-cuda" - _package -} - -# vim:set ts=2 sw=2 et: diff --git a/python-pytorch/disable-werror1.patch b/python-pytorch/disable-werror1.patch deleted file mode 100644 index a832e0ad..00000000 --- a/python-pytorch/disable-werror1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58dcb9a..269a7a6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -144,7 +144,7 @@ if(MSVC) - else(MSVC) - string(APPEND CMAKE_CXX_FLAGS " -Wall") - string(APPEND CMAKE_CXX_FLAGS " -Wextra") -- string(APPEND CMAKE_CXX_FLAGS " -Werror") -+ # string(APPEND CMAKE_CXX_FLAGS " -Werror") - string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations") - target_compile_options(fbgemm_avx2 PRIVATE - "-m64" "-mavx2" "-mf16c" "-mfma") diff --git a/python-pytorch/disable-werror2.patch b/python-pytorch/disable-werror2.patch deleted file mode 100644 index b0b81ca8..00000000 --- a/python-pytorch/disable-werror2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8852e4..cf1d447 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON) - option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the benchmark library." ON) - option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark library." OFF) - option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard library." OFF) --option(BENCHMARK_ENABLE_WERROR "Build Release candidates with -Werror." ON) -+option(BENCHMARK_ENABLE_WERROR "Build Release candidates with -Werror." OFF) - option(BENCHMARK_FORCE_WERROR "Build Release candidates with -Werror regardless of compiler issues." OFF) - - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI") diff --git a/python-pytorch/disable-werror4.patch b/python-pytorch/disable-werror4.patch deleted file mode 100644 index 5c908ad2..00000000 --- a/python-pytorch/disable-werror4.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9addcf005b..27d2c761f4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -797,10 +797,8 @@ if(NOT MSVC) - # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 - string(APPEND CMAKE_CXX_FLAGS " -Wall") - string(APPEND CMAKE_CXX_FLAGS " -Wextra") -- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) -- append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=bool-operation" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Wnarrowing" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Wno-missing-field-initializers" CMAKE_CXX_FLAGS) diff --git a/python-pytorch/ffmpeg4.4.patch b/python-pytorch/ffmpeg4.4.patch deleted file mode 100644 index 6a0a70e3..00000000 --- a/python-pytorch/ffmpeg4.4.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake -index 04437562ee..dc8fe4aa5c 100644 ---- a/cmake/Modules/FindFFmpeg.cmake -+++ b/cmake/Modules/FindFFmpeg.cmake -@@ -14,34 +14,40 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR) - - find_path(FFMPEG_AVCODEC_INCLUDE_DIR - NAMES libavcodec/avcodec.h -- PATHS ${_FFMPEG_AVCODEC_INCLUDE_DIRS} /usr/include /usr/local/include /opt/local/include /sw/include -+ PATHS /usr/include/ffmpeg4.4 /usr/local/include /opt/local/include /sw/include - PATH_SUFFIXES ffmpeg libav -+ NO_DEFAULT_PATH - ) - - find_library(FFMPEG_LIBAVCODEC - NAMES avcodec -- PATHS ${_FFMPEG_AVCODEC_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib -+ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib -+ NO_DEFAULT_PATH - ) - - find_library(FFMPEG_LIBAVFORMAT - NAMES avformat -- PATHS ${_FFMPEG_AVFORMAT_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib -+ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib -+ NO_DEFAULT_PATH - ) - - find_library(FFMPEG_LIBAVUTIL - NAMES avutil -- PATHS ${_FFMPEG_AVUTIL_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib -+ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib -+ NO_DEFAULT_PATH - ) - - - find_library(FFMPEG_LIBSWSCALE - NAMES swscale -- PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib -+ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib -+ NO_DEFAULT_PATH - ) - - find_library(FFMPEG_LIBSWRESAMPLE - NAMES swresample -- PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib -+ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib -+ NO_DEFAULT_PATH - ) - - if (FFMPEG_LIBAVCODEC AND FFMPEG_LIBAVFORMAT) diff --git a/python-pytorch/fix-building-for-torchvision.patch b/python-pytorch/fix-building-for-torchvision.patch deleted file mode 100644 index 41171e05..00000000 --- a/python-pytorch/fix-building-for-torchvision.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 011495d8045c44527fbd7796ce860618120ae127 Mon Sep 17 00:00:00 2001 -From: Butui Hu -Date: Fri, 30 Apr 2021 11:36:30 +0800 -Subject: [PATCH] fix building torchvision - ---- - aten/src/ATen/core/op_registration/op_allowlist.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/aten/src/ATen/core/op_registration/op_allowlist.h b/aten/src/ATen/core/op_registration/op_allowlist.h -index f93462bb2cf..12903d1cc09 100644 ---- a/aten/src/ATen/core/op_registration/op_allowlist.h -+++ b/aten/src/ATen/core/op_registration/op_allowlist.h -@@ -59,7 +59,7 @@ constexpr bool op_allowlist_contains(string_view allowlist, string_view item) { - // Returns true iff the given op name is on the allowlist - // and should be registered - constexpr bool op_allowlist_check(string_view op_name) { -- assert(op_name.find("::") != string_view::npos); -+// assert(op_name.find("::") != string_view::npos); - // Use assert() instead of throw() due to a gcc bug. See: - // https://stackoverflow.com/questions/34280729/throw-in-constexpr-function - // https://github.com/fmtlib/fmt/issues/682 --- -2.31.1 - diff --git a/python-pytorch/fix_include_system.patch b/python-pytorch/fix_include_system.patch deleted file mode 100644 index 3eb4fff3..00000000 --- a/python-pytorch/fix_include_system.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py -index ca673033e1..c79ce8d37b 100644 ---- a/torch/utils/cpp_extension.py -+++ b/torch/utils/cpp_extension.py -@@ -1760,7 +1760,7 @@ def _write_ninja_file_to_build_library(path, - common_cflags.append(f'-DPYBIND11_{pname}=\\"{pval}\\"') - - common_cflags += [f'-I{include}' for include in user_includes] -- common_cflags += [f'-isystem {include}' for include in system_includes] -+ common_cflags += [f'-I{include}' for include in system_includes] - - common_cflags += ['-D_GLIBCXX_USE_CXX11_ABI=' + str(int(torch._C._GLIBCXX_USE_CXX11_ABI))] - diff --git a/python-pytorch/glog-0.7.patch b/python-pytorch/glog-0.7.patch deleted file mode 100644 index a9ce59a0..00000000 --- a/python-pytorch/glog-0.7.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp -index f4eef35b147..5a0a850650e 100644 ---- a/c10/util/Logging.cpp -+++ b/c10/util/Logging.cpp -@@ -280,20 +280,20 @@ void UpdateLoggingLevelsFromFlags() { - #endif - // If caffe2_log_level is set and is lower than the min log level by glog, - // we will transfer the caffe2_log_level setting to glog to override that. -- FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, FLAGS_minloglevel); -+ FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, static_cast(FLAGS_minloglevel)); - // If caffe2_log_level is explicitly set, let's also turn on logtostderr. - if (FLAGS_caffe2_log_level < google::GLOG_WARNING) { - FLAGS_logtostderr = 1; - } - // Also, transfer the caffe2_log_level verbose setting to glog. - if (FLAGS_caffe2_log_level < 0) { -- FLAGS_v = std::min(FLAGS_v, -FLAGS_caffe2_log_level); -+ FLAGS_v = std::min(FLAGS_v, static_cast(-FLAGS_caffe2_log_level)); - } - } - - void ShowLogInfoToStderr() { - FLAGS_logtostderr = 1; -- FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO); -+ FLAGS_minloglevel = std::min(FLAGS_minloglevel, static_cast(google::GLOG_INFO)); - } - } // namespace c10 - diff --git a/python-pytorch/patch.patch b/python-pytorch/patch.patch deleted file mode 100644 index 837cbe16..00000000 --- a/python-pytorch/patch.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff --git a/PKGBUILD b/PKGBUILD -index ddf6b91..c0cf34d 100644 ---- a/PKGBUILD -+++ b/PKGBUILD -@@ -4,10 +4,10 @@ - - _pkgname=pytorch - pkgbase="python-${_pkgname}" --pkgname=("${pkgbase}" "${pkgbase}-opt" "${pkgbase}-cuda" "${pkgbase}-opt-cuda" "${pkgbase}-rocm" "${pkgbase}-opt-rocm") --pkgver=2.2.1 --_pkgver=2.2.1 --pkgrel=1 -+pkgname=( "${pkgbase}-avx512-cuda") -+pkgver=2.2.0 -+_pkgver=2.2.0 -+pkgrel=4 - _pkgdesc='Tensors and Dynamic neural networks in Python with strong GPU acceleration' - pkgdesc="${_pkgdesc}" - arch=('x86_64') -@@ -18,7 +18,7 @@ depends=('google-glog' 'gflags' 'opencv' 'openmp' 'openmpi' 'pybind11' 'python' - 'intel-oneapi-mkl' 'python-typing_extensions' 'numactl' 'python-jinja' - 'python-networkx' 'python-filelock') - makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' -- 'nccl' 'cudnn' 'git' 'rocm-hip-sdk' 'roctracer' 'miopen' 'magma-cuda' 'magma-hip' -+ 'nccl' 'cudnn' 'git' 'magma-cuda' - 'ninja' 'pkgconfig' 'doxygen' 'vulkan-headers' 'shaderc' 'onednn') - source=("${_pkgname}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver" - # generated using parse-submodules -@@ -243,11 +243,7 @@ prepare() { - - cd "${srcdir}" - -- cp -r "${_pkgname}" "${_pkgname}-opt" -- cp -r "${_pkgname}" "${_pkgname}-cuda" -- cp -r "${_pkgname}" "${_pkgname}-opt-cuda" -- cp -r "${_pkgname}" "${_pkgname}-rocm" -- cp -r "${_pkgname}" "${_pkgname}-opt-rocm" -+ cp -r "${_pkgname}" "${_pkgname}-avx512-cuda" - } - - # Common build configuration, called in all package() functions. -@@ -303,75 +299,18 @@ build() { - cd "${srcdir}/${_pkgname}" - echo "Building without cuda or rocm and without non-x86-64 optimizations" - _prepare -- export USE_CUDA=0 -- export USE_CUDNN=0 -- export USE_ROCM=0 -- echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake -- # this horrible hack is necessary because the current release -- # ships inconsistent CMake which tries to build objects before -- # their dependencies, build twice when dependencies are available -- python setup.py build || python setup.py build -- -- cd "${srcdir}/${_pkgname}-opt" -- echo "Building without cuda or rocm and with non-x86-64 optimizations" -- _prepare -- export USE_CUDA=0 -- export USE_CUDNN=0 -- export USE_ROCM=0 -- echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake -- # same horrible hack as above -- python setup.py build || python setup.py build -- -- cd "${srcdir}/${_pkgname}-cuda" -- echo "Building with cuda and without non-x86-64 optimizations" -- _prepare -- export USE_CUDA=1 -- export USE_CUDNN=1 -- export USE_ROCM=0 -- export MAGMA_HOME=/opt/cuda/targets/x86_64-linux -- cd "${srcdir}/${_pkgname}-cuda" -- echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake -- # same horrible hack as above -- python setup.py build || python setup.py build - -- cd "${srcdir}/${_pkgname}-opt-cuda" -- echo "Building with cuda and with non-x86-64 optimizations" -+ cd "${srcdir}/${_pkgname}-avx512-cuda" -+ echo "Building with cuda and with avx512 optimizations" - export USE_CUDA=1 - export USE_CUDNN=1 - export USE_ROCM=0 - export MAGMA_HOME=/opt/cuda/targets/x86_64-linux - _prepare -- echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake -+ echo "add_definitions(-march=x86-64-v4)" >> cmake/MiscCheck.cmake - # same horrible hack as above - python setup.py build || python setup.py build - -- cd "${srcdir}/${_pkgname}-rocm" -- echo "Building with rocm and without non-x86-64 optimizations" -- _prepare -- export USE_CUDA=0 -- export USE_CUDNN=0 -- export USE_ROCM=1 -- export MAGMA_HOME=/opt/rocm -- echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake -- # Conversion of CUDA to ROCm source files -- python tools/amd_build/build_amd.py -- patch -Np1 -i "$srcdir/pytorch-rocm-jit.patch" -- # same horrible hack as above -- python setup.py build || python setup.py build -- -- cd "${srcdir}/${_pkgname}-opt-rocm" -- echo "Building with rocm and with non-x86-64 optimizations" -- _prepare -- export USE_CUDA=0 -- export USE_CUDNN=0 -- export USE_ROCM=1 -- export MAGMA_HOME=/opt/rocm -- echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake -- # Conversion of CUDA to ROCm source files -- python tools/amd_build/build_amd.py -- patch -Np1 -i "$srcdir/pytorch-rocm-jit.patch" -- # same horrible hack as above -- python setup.py build || python setup.py build - } - - _package() { -@@ -405,59 +344,13 @@ _package() { - done - } - --package_python-pytorch() { -- pkgdesc="${_pkgdesc}" -- -- cd "${srcdir}/${_pkgname}" -- _package --} -- --package_python-pytorch-opt() { -- pkgdesc="${_pkgdesc} (with AVX2 CPU optimizations)" -- conflicts=(python-pytorch) -- provides=(python-pytorch=${pkgver}) -- -- cd "${srcdir}/${_pkgname}-opt" -- _package --} -- --package_python-pytorch-cuda() { -- pkgdesc="${_pkgdesc} (with CUDA)" -- depends+=(cuda nccl cudnn magma-cuda onednn) -- conflicts=(python-pytorch) -- provides=(python-pytorch=${pkgver}) -- -- cd "${srcdir}/${_pkgname}-cuda" -- _package --} -- --package_python-pytorch-opt-cuda() { -- pkgdesc="${_pkgdesc} (with CUDA and AVX2 CPU optimizations)" -+package_python-pytorch-avx512-cuda() { -+ pkgdesc="${_pkgdesc} (with CUDA and AVX512 CPU optimizations)" - depends+=(cuda nccl cudnn magma-cuda onednn) - conflicts=(python-pytorch) - provides=(python-pytorch=${pkgver} python-pytorch-cuda=${pkgver}) - -- cd "${srcdir}/${_pkgname}-opt-cuda" -- _package --} -- --package_python-pytorch-rocm() { -- pkgdesc="${_pkgdesc} (with ROCm)" -- depends+=(rocm-hip-sdk roctracer miopen magma-hip onednn) -- conflicts=(python-pytorch) -- provides=(python-pytorch=${pkgver}) -- -- cd "${srcdir}/${_pkgname}-rocm" -- _package --} -- --package_python-pytorch-opt-rocm() { -- pkgdesc="${_pkgdesc} (with ROCm and AVX2 CPU optimizations)" -- depends+=(rocm-hip-sdk roctracer miopen magma-hip onednn) -- conflicts=(python-pytorch) -- provides=(python-pytorch=${pkgver} python-pytorch-rocm=${pkgver}) -- -- cd "${srcdir}/${_pkgname}-opt-rocm" -+ cd "${srcdir}/${_pkgname}-avx512-cuda" - _package - } - diff --git a/python-pytorch/protobuf-23.patch b/python-pytorch/protobuf-23.patch deleted file mode 100644 index 1eff81e1..00000000 --- a/python-pytorch/protobuf-23.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/caffe2/onnx/backend.cc b/caffe2/onnx/backend.cc -index d1607ea97f4..02104268bcc 100644 ---- a/caffe2/onnx/backend.cc -+++ b/caffe2/onnx/backend.cc -@@ -1796,19 +1796,19 @@ void Caffe2Backend::BuildTensorFillingOp( - c2_op, c2_values, onnx_tensor); - // NOLINTNEXTLINE(bugprone-branch-clone) - } else if (onnx_tensor.data_type() == TensorProto::BOOL) { -- ConvertIntegralValueToCaffe2<::google::protobuf::int8>( -+ ConvertIntegralValueToCaffe2<::google::protobuf::int32>( - c2_op, c2_values, onnx_tensor); - } else if (onnx_tensor.data_type() == TensorProto::UINT8) { -- ConvertIntegralValueToCaffe2<::google::protobuf::uint8>( -+ ConvertIntegralValueToCaffe2<::google::protobuf::uint32>( - c2_op, c2_values, onnx_tensor); - } else if (onnx_tensor.data_type() == TensorProto::INT8) { -- ConvertIntegralValueToCaffe2<::google::protobuf::int8>( -+ ConvertIntegralValueToCaffe2<::google::protobuf::int32>( - c2_op, c2_values, onnx_tensor); - } else if (onnx_tensor.data_type() == TensorProto::UINT16) { -- ConvertIntegralValueToCaffe2<::google::protobuf::uint16>( -+ ConvertIntegralValueToCaffe2<::google::protobuf::uint32>( - c2_op, c2_values, onnx_tensor); - } else if (onnx_tensor.data_type() == TensorProto::INT16) { -- ConvertIntegralValueToCaffe2<::google::protobuf::int16>( -+ ConvertIntegralValueToCaffe2<::google::protobuf::int32>( - c2_op, c2_values, onnx_tensor); - } else if (onnx_tensor.data_type() == TensorProto::INT32) { - ConvertIntegralValueToCaffe2<::google::protobuf::int32>( diff --git a/python-pytorch/python-pytorch-ffmpeg6.patch b/python-pytorch/python-pytorch-ffmpeg6.patch deleted file mode 100644 index 4ed46501..00000000 --- a/python-pytorch/python-pytorch-ffmpeg6.patch +++ /dev/null @@ -1,218 +0,0 @@ -From: Gard Spreemann -Date: Fri, 11 Feb 2022 20:59:35 +0100 -Subject: FFMPEG 5.0 support - ---- - caffe2/video/video_decoder.cc | 77 ++++++++++++++++++++++++++++++------------- - caffe2/video/video_decoder.h | 1 + - 2 files changed, 55 insertions(+), 23 deletions(-) - -diff --git a/caffe2/video/video_decoder.cc b/caffe2/video/video_decoder.cc -index d40bc05..9ab7271 100644 ---- a/caffe2/video/video_decoder.cc -+++ b/caffe2/video/video_decoder.cc -@@ -12,8 +12,10 @@ VideoDecoder::VideoDecoder() { - static std::mutex gMutex; - std::unique_lock lock(gMutex); - if (!gInitialized) { -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100) - av_register_all(); - avcodec_register_all(); -+#endif - avformat_network_init(); - gInitialized = true; - } -@@ -27,8 +29,20 @@ void VideoDecoder::getAudioSample( - Callback& callback, - const Params& params) { - int frame_finished = 0; -- auto result = avcodec_decode_audio4( -- audioCodecContext_, audioStreamFrame_, &frame_finished, &packet); -+ -+ int result = avcodec_send_packet(audioCodecContext_, &packet); -+ if (result < 0) { -+ LOG(ERROR) << "Failed to decode audio packet: " << ffmpegErrorStr(result); -+ return; -+ } -+ result = avcodec_receive_frame(audioCodecContext_, audioStreamFrame_); -+ if (result == 0) { -+ frame_finished = 1; -+ } -+ else if (result < 0 && result != AVERROR(EAGAIN) && result != AVERROR_EOF) { -+ LOG(ERROR) << "Failed to decode audio packet: " << ffmpegErrorStr(result); -+ return; -+ } - - if (frame_finished) { - // from -@@ -185,12 +199,12 @@ void VideoDecoder::decodeLoop( - if (params.streamIndex_ == -1) { - for (int i = 0; i < inputContext->nb_streams; i++) { - auto stream = inputContext->streams[i]; -- if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO && -+ if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - videoStreamIndex_ == -1) { - videoStreamIndex_ = i; - videoStream_ = stream; - } else if ( -- stream->codec->codec_type == AVMEDIA_TYPE_AUDIO && -+ stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && - audioStreamIndex_ == -1) { - audioStreamIndex_ = i; - } -@@ -207,7 +221,11 @@ void VideoDecoder::decodeLoop( - - // Initialize codec - AVDictionary* opts = nullptr; -- videoCodecContext_ = videoStream_->codec; -+ ret = avcodec_parameters_to_context(videoCodecContext_, videoStream_->codecpar); -+ if (ret < 0) { -+ LOG(ERROR) << "Cannot get codec context from parameters"; -+ return; -+ } - try { - ret = avcodec_open2( - videoCodecContext_, -@@ -226,7 +244,11 @@ void VideoDecoder::decodeLoop( - - if (params.getAudio_ && audioStreamIndex_ >= 0) { - // see e.g. ridge/decoder/StreamDecoder.cpp -- audioCodecContext_ = inputContext->streams[audioStreamIndex_]->codec; -+ ret = avcodec_parameters_to_context(audioCodecContext_, inputContext->streams[audioStreamIndex_]->codecpar); -+ if (ret < 0) { -+ LOG(ERROR) << "Failed to get codec parameters: " << ffmpegErrorStr(ret); -+ return; -+ } - ret = avcodec_open2( - audioCodecContext_, - avcodec_find_decoder(audioCodecContext_->codec_id), -@@ -452,12 +474,12 @@ void VideoDecoder::decodeLoop( - ret = av_read_frame(inputContext, &packet); - if (ret == AVERROR_EOF) { - eof = 1; -- av_free_packet(&packet); -+ av_packet_unref(&packet); - packet.data = nullptr; - packet.size = 0; - // stay in the while loop to flush frames - } else if (ret == AVERROR(EAGAIN)) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - continue; - } else if (ret < 0) { - LOG(ERROR) << "Error reading packet : " << ffmpegErrorStr(ret); -@@ -483,13 +505,17 @@ void VideoDecoder::decodeLoop( - } - - if (si != videoStreamIndex_) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - continue; - } - } - -- ret = avcodec_decode_video2( -- videoCodecContext_, videoStreamFrame_, &gotPicture, &packet); -+ ret = avcodec_send_packet(videoCodecContext_, &packet); -+ if (ret < 0) { -+ LOG(ERROR) << "Error decoding video frame : " << ffmpegErrorStr(ret); -+ return; -+ } -+ ret = avcodec_receive_frame(videoCodecContext_, videoStreamFrame_); - if (ret < 0) { - LOG(ERROR) << "Error decoding video frame : " << ffmpegErrorStr(ret); - return; -@@ -497,13 +523,12 @@ void VideoDecoder::decodeLoop( - try { - // Nothing to do without a picture - if (!gotPicture) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - continue; - } - frameIndex++; - -- long int frame_ts = -- av_frame_get_best_effort_timestamp(videoStreamFrame_); -+ long int frame_ts = videoStreamFrame_->best_effort_timestamp; - timestamp = frame_ts * av_q2d(videoStream_->time_base); - if ((frame_ts >= start_ts && !mustDecodeAll) || mustDecodeAll) { - /* process current frame if: -@@ -534,7 +559,7 @@ void VideoDecoder::decodeLoop( - if (!keyFrame) { - // if fps == SpecialFps::SAMPLE_NO_FRAME (0), don't sample at all - if (currFps == SpecialFps::SAMPLE_NO_FRAME) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - continue; - } - -@@ -560,7 +585,7 @@ void VideoDecoder::decodeLoop( - timestamp >= lastFrameTimestamp + (1 / currFps)); - - if (!fpsReached) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - continue; - } - } -@@ -571,7 +596,7 @@ void VideoDecoder::decodeLoop( - if (params.maximumOutputFrames_ != -1 && - outputFrameIndex >= params.maximumOutputFrames_) { - // enough frames -- av_free_packet(&packet); -+ av_packet_unref(&packet); - break; - } - -@@ -583,16 +608,22 @@ void VideoDecoder::decodeLoop( - - try { - // Determine required buffer size and allocate buffer -- int numBytes = avpicture_get_size(pixFormat, outWidth, outHeight); -+ int numBytes = av_image_get_buffer_size(pixFormat, outWidth, outHeight, 1); - DecodedFrame::AvDataPtr buffer( - (uint8_t*)av_malloc(numBytes * sizeof(uint8_t))); - -- int size = avpicture_fill( -- (AVPicture*)rgbFrame, -+ int size = av_image_fill_arrays( -+ rgbFrame->data, -+ rgbFrame->linesize, - buffer.get(), - pixFormat, - outWidth, -- outHeight); -+ outHeight, -+ 1); -+ if (size < 0) { -+ LOG(ERROR) << "Failed to fill frame"; -+ return; -+ } - - sws_scale( - scaleContext_, -@@ -628,9 +659,9 @@ void VideoDecoder::decodeLoop( - av_frame_unref(audioStreamFrame_); - } - -- av_free_packet(&packet); -+ av_packet_unref(&packet); - } catch (const std::exception&) { -- av_free_packet(&packet); -+ av_packet_unref(&packet); - } - } // of while loop - callback.videoDecodingEnded(timestamp); -diff --git a/caffe2/video/video_decoder.h b/caffe2/video/video_decoder.h -index a091142..8c061fd 100644 ---- a/caffe2/video/video_decoder.h -+++ b/caffe2/video/video_decoder.h -@@ -11,6 +11,7 @@ extern "C" { - #include - #include - #include -+#include - #include - #include - #include diff --git a/python-pytorch/python-pytorch-fix-cuda-12_4.patch b/python-pytorch/python-pytorch-fix-cuda-12_4.patch deleted file mode 100644 index 25f8a916..00000000 --- a/python-pytorch/python-pytorch-fix-cuda-12_4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/aten/src/ATen/core/boxing/impl/boxing.h 2024-03-19 19:57:10.939716493 +0000 -+++ b/aten/src/ATen/core/boxing/impl/boxing.h 2024-03-19 20:30:47.642693577 +0000 -@@ -38,7 +38,15 @@ - struct has_ivalue_to : std::false_type {}; - - template --struct has_ivalue_to().to())>> -+struct __ivalue_to_helper__ -+{ -+ using type = decltype(std::declval().template to()); -+}; -+template -+using __ivalue_to_helper_t = typename __ivalue_to_helper__::type; -+ -+template -+struct has_ivalue_to>> - : std::true_type - {}; diff --git a/python-pytorch/python-pytorch-goo-rocm-6.patch b/python-pytorch/python-pytorch-goo-rocm-6.patch deleted file mode 100644 index 8914e1d1..00000000 --- a/python-pytorch/python-pytorch-goo-rocm-6.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 2cbcef29a6aff241896a86c719195f1757bfd1b8 Mon Sep 17 00:00:00 2001 -From: Pruthvi Madugundu -Date: Fri, 13 Oct 2023 19:09:01 -0700 -Subject: [PATCH] Updates to Hip.cmake to support recent ROCm (#371) - -Summary: -- Remove deprecated HIP_PATH -- Cleanup of unused variables - -Pull Request resolved: https://github.com/facebookincubator/gloo/pull/371 - -Reviewed By: kit1980 - -Differential Revision: D50140546 - -Pulled By: malfet - -fbshipit-source-id: 004bca04ba415df37c181652dfcd4e36353d769d ---- - cmake/Hip.cmake | 103 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 99 deletions(-) - -diff --git a/cmake/Hip.cmake b/cmake/Hip.cmake -index 31a03e7b9..18a3c075b 100644 ---- a/cmake/Hip.cmake -+++ b/cmake/Hip.cmake -@@ -6,102 +6,14 @@ ELSE() - SET(ROCM_PATH $ENV{ROCM_PATH}) - ENDIF() - --# HIP_PATH --IF(NOT DEFINED ENV{HIP_PATH}) -- SET(HIP_PATH ${ROCM_PATH}/hip) --ELSE() -- SET(HIP_PATH $ENV{HIP_PATH}) --ENDIF() -- --IF(NOT EXISTS ${HIP_PATH}) -- return() --ENDIF() -- --# HCC_PATH --IF(NOT DEFINED ENV{HCC_PATH}) -- SET(HCC_PATH ${ROCM_PATH}/hcc) --ELSE() -- SET(HCC_PATH $ENV{HCC_PATH}) --ENDIF() -- --# HSA_PATH --IF(NOT DEFINED ENV{HSA_PATH}) -- SET(HSA_PATH ${ROCM_PATH}/hsa) --ELSE() -- SET(HSA_PATH $ENV{HSA_PATH}) --ENDIF() -- --# ROCBLAS_PATH --IF(NOT DEFINED ENV{ROCBLAS_PATH}) -- SET(ROCBLAS_PATH ${ROCM_PATH}/rocblas) --ELSE() -- SET(ROCBLAS_PATH $ENV{ROCBLAS_PATH}) --ENDIF() -- --# ROCSPARSE_PATH --IF(NOT DEFINED ENV{ROCSPARSE_PATH}) -- SET(ROCSPARSE_PATH ${ROCM_PATH}/rocsparse) --ELSE() -- SET(ROCSPARSE_PATH $ENV{ROCSPARSE_PATH}) --ENDIF() -- --# ROCFFT_PATH --IF(NOT DEFINED ENV{ROCFFT_PATH}) -- SET(ROCFFT_PATH ${ROCM_PATH}/rocfft) --ELSE() -- SET(ROCFFT_PATH $ENV{ROCFFT_PATH}) --ENDIF() -- --# HIPSPARSE_PATH --IF(NOT DEFINED ENV{HIPSPARSE_PATH}) -- SET(HIPSPARSE_PATH ${ROCM_PATH}/hipsparse) --ELSE() -- SET(HIPSPARSE_PATH $ENV{HIPSPARSE_PATH}) --ENDIF() -- --# THRUST_PATH --IF(DEFINED ENV{THRUST_PATH}) -- SET(THRUST_PATH $ENV{THRUST_PATH}) --ELSE() -- SET(THRUST_PATH ${ROCM_PATH}/include) --ENDIF() -- --# HIPRAND_PATH --IF(NOT DEFINED ENV{HIPRAND_PATH}) -- SET(HIPRAND_PATH ${ROCM_PATH}/hiprand) --ELSE() -- SET(HIPRAND_PATH $ENV{HIPRAND_PATH}) --ENDIF() -- --# ROCRAND_PATH --IF(NOT DEFINED ENV{ROCRAND_PATH}) -- SET(ROCRAND_PATH ${ROCM_PATH}/rocrand) --ELSE() -- SET(ROCRAND_PATH $ENV{ROCRAND_PATH}) --ENDIF() -- --# MIOPENGEMM --IF(NOT DEFINED ENV{MIOPENGEMM_PATH}) -- SET(MIOPENGEMM_PATH ${ROCM_PATH}/miopengemm) --ELSE() -- SET(MIOPENGEMM_PATH $ENV{MIOPENGEMM_PATH}) --ENDIF() -- --# MIOPEN_PATH --IF(NOT DEFINED ENV{MIOPEN_PATH}) -- SET(MIOPEN_PATH ${ROCM_PATH}/miopen) --ELSE() -- SET(MIOPEN_PATH $ENV{MIOPEN_PATH}) --ENDIF() -- - IF(NOT DEFINED ENV{GLOO_ROCM_ARCH}) -- SET(GLOO_ROCM_ARCH gfx900;gfx906) -+ SET(GLOO_ROCM_ARCH gfx906;gfx908;gfx90a) - ELSE() - SET(GLOO_ROCM_ARCH $ENV{GLOO_ROCM_ARCH}) - ENDIF() - - # Add HIP to the CMAKE Module Path --set(CMAKE_MODULE_PATH ${HIP_PATH}/cmake ${CMAKE_MODULE_PATH}) -+set(CMAKE_MODULE_PATH ${ROCM_PATH}/lib/cmake/hip ${CMAKE_MODULE_PATH}) - - # Disable Asserts In Code (Can't use asserts on HIP stack.) - ADD_DEFINITIONS(-DNDEBUG) -@@ -112,19 +24,12 @@ find_package(HIP 1.0) - IF(HIP_FOUND) - set(HAVE_HIP TRUE) - -- if(HIP_COMPILER STREQUAL clang) -- set(hip_library_name amdhip64) -- else() -- set(hip_library_name hip_hcc) -- endif() -+ set(hip_library_name amdhip64) - message("HIP library name: ${hip_library_name}") - - set(CMAKE_HCC_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - set(CMAKE_HCC_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) -- FIND_LIBRARY(GLOO_HIP_HCC_LIBRARIES ${hip_library_name} HINTS ${HIP_PATH}/lib) -- # Necessary includes for building Gloo since we include HIP headers that depend on hcc/hsa headers. -- set(hcc_INCLUDE_DIRS ${HCC_PATH}/include) -- set(hsa_INCLUDE_DIRS ${HSA_PATH}/include) -+ FIND_LIBRARY(GLOO_HIP_HCC_LIBRARIES ${hip_library_name} HINTS ${ROCM_PATH}/lib) - - ENDIF() - diff --git a/python-pytorch/python-pytorch-rocm-6.patch b/python-pytorch/python-pytorch-rocm-6.patch deleted file mode 100644 index a87c9f67..00000000 --- a/python-pytorch/python-pytorch-rocm-6.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 602abf6b55cb11c3dce0c046b3cfbc417b5080d6 Mon Sep 17 00:00:00 2001 -From: Jeff Daily -Date: Wed, 20 Dec 2023 20:19:25 +0000 -Subject: [PATCH] [ROCm] more 6.0 changes (#115946) - -Pull Request resolved: https://github.com/pytorch/pytorch/pull/115946 -Approved by: https://github.com/pruthvistony, https://github.com/huydhn, https://github.com/malfet ---- - aten/src/ATen/cuda/detail/CUDAHooks.cpp | 2 +- - caffe2/CMakeLists.txt | 2 +- - caffe2/core/common_gpu.h | 2 +- - caffe2/operators/elementwise_ops.cu | 2 ++ - cmake/public/LoadHIP.cmake | 3 +-- - 5 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/aten/src/ATen/cuda/detail/CUDAHooks.cpp b/aten/src/ATen/cuda/detail/CUDAHooks.cpp -index acb9b1931f045e0..24c29a638154499 100644 ---- a/aten/src/ATen/cuda/detail/CUDAHooks.cpp -+++ b/aten/src/ATen/cuda/detail/CUDAHooks.cpp -@@ -151,7 +151,7 @@ bool CUDAHooks::isPinnedPtr(const void* data) const { - return false; - } - #endif --#if !defined(USE_ROCM) -+#if !defined(USE_ROCM) || (defined(USE_ROCM) && ROCM_VERSION >= 50700) - return attr.type == cudaMemoryTypeHost; - #else - return attr.memoryType == cudaMemoryTypeHost; -diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index f2acc61ad389c7e..b035e50f81ae3f6 100644 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -698,7 +698,7 @@ if(USE_ROCM) - add_library(caffe2_nvrtc SHARED ${ATen_NVRTC_STUB_SRCS}) - target_link_libraries(caffe2_nvrtc ${PYTORCH_HIP_LIBRARIES} ${ROCM_HIPRTC_LIB}) - target_include_directories(caffe2_nvrtc PRIVATE ${CMAKE_BINARY_DIR}) -- target_compile_definitions(caffe2_nvrtc PRIVATE USE_ROCM __HIP_PLATFORM_HCC__) -+ target_compile_definitions(caffe2_nvrtc PRIVATE USE_ROCM __HIP_PLATFORM_AMD__) - install(TARGETS caffe2_nvrtc DESTINATION "${TORCH_INSTALL_LIB_DIR}") - endif() - -diff --git a/caffe2/core/common_gpu.h b/caffe2/core/common_gpu.h -index af1cc891e567eff..bbf25a51352175b 100644 ---- a/caffe2/core/common_gpu.h -+++ b/caffe2/core/common_gpu.h -@@ -86,7 +86,7 @@ namespace caffe2 { - class TensorCoreEngine {}; - #endif // USE_ROCM - --#if !defined(USE_ROCM) -+#if !defined(USE_ROCM) || (defined(USE_ROCM) && ROCM_VERSION >= 50700) - #define CAFFE2_CUDA_PTRATTR_MEMTYPE type - #else - #define CAFFE2_CUDA_PTRATTR_MEMTYPE memoryType -diff --git a/caffe2/operators/elementwise_ops.cu b/caffe2/operators/elementwise_ops.cu -index b78b94c52147806..2237f2015feba2d 100644 ---- a/caffe2/operators/elementwise_ops.cu -+++ b/caffe2/operators/elementwise_ops.cu -@@ -13,8 +13,10 @@ - // until we use hipblas v2 - // hipify correctly maps things like CUDA_R_16F to HIP_R_16F, - // however hipblas v1 is still using its custom type -+#ifndef HIPBLAS_V2 - #define HIP_R_16F HIPBLAS_R_16F - #define HIP_R_32F HIPBLAS_R_32F -+#endif - #endif // USE_ROCM - - namespace caffe2 { -diff --git a/cmake/public/LoadHIP.cmake b/cmake/public/LoadHIP.cmake -index f7344cc310842e1..197c60e7b7f6297 100644 ---- a/cmake/public/LoadHIP.cmake -+++ b/cmake/public/LoadHIP.cmake -@@ -187,8 +187,7 @@ if(HIP_FOUND) - else() - find_library(PYTORCH_RCCL_LIBRARIES ${rccl_LIBRARIES} HINTS ${ROCM_PATH}/lib) - endif() -- # hiprtc is part of HIP -- find_library(ROCM_HIPRTC_LIB amdhip64 HINTS ${ROCM_PATH}/lib) -+ find_library(ROCM_HIPRTC_LIB hiprtc HINTS ${ROCM_PATH}/lib) - # roctx is part of roctracer - find_library(ROCM_ROCTX_LIB roctx64 HINTS ${ROCM_PATH}/lib) - diff --git a/python-pytorch/pytorch-missing-iostream.patch b/python-pytorch/pytorch-missing-iostream.patch deleted file mode 100644 index 606486e3..00000000 --- a/python-pytorch/pytorch-missing-iostream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/binaries/dump_operator_names.cc b/binaries/dump_operator_names.cc -index f77f93bf592..9ebd47ba6c1 100644 ---- a/binaries/dump_operator_names.cc -+++ b/binaries/dump_operator_names.cc -@@ -21,6 +21,7 @@ - #include - - #include -+#include - - namespace torch { - namespace jit { diff --git a/python-pytorch/pytorch-remove-caffe2-binaries.patch b/python-pytorch/pytorch-remove-caffe2-binaries.patch deleted file mode 100644 index 3c9064b5..00000000 --- a/python-pytorch/pytorch-remove-caffe2-binaries.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/binaries/CMakeLists.txt b/binaries/CMakeLists.txt -index 15f47bf52ae..fac768ff78c 100644 ---- a/binaries/CMakeLists.txt -+++ b/binaries/CMakeLists.txt -@@ -1,42 +1,3 @@ --if(INTERN_BUILD_MOBILE) -- caffe2_binary_target("speed_benchmark_torch.cc") -- caffe2_binary_target("load_benchmark_torch.cc") -- if(NOT BUILD_LITE_INTERPRETER) -- caffe2_binary_target("compare_models_torch.cc") -- endif() -- return() --endif() -- --if(BUILD_CAFFE2) -- caffe2_binary_target("convert_caffe_image_db.cc") -- caffe2_binary_target("convert_db.cc") -- caffe2_binary_target("make_cifar_db.cc") -- caffe2_binary_target("make_mnist_db.cc") -- caffe2_binary_target("predictor_verifier.cc") -- caffe2_binary_target("speed_benchmark.cc") -- caffe2_binary_target("split_db.cc") -- caffe2_binary_target("print_registered_core_operators.cc") -- -- if(USE_OBSERVERS) -- caffe2_binary_target(caffe2_benchmark "caffe2_benchmark.cc" "benchmark_helper.cc") -- target_include_directories(caffe2_benchmark PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../modules) -- endif() -- -- caffe2_binary_target("at_launch_benchmark.cc") -- target_include_directories(at_launch_benchmark PUBLIC -- ${CMAKE_BINARY_DIR}/aten/src) -- -- caffe2_binary_target("intra_inter_benchmark.cc") -- target_include_directories(intra_inter_benchmark PUBLIC -- ${CMAKE_BINARY_DIR}/aten/src) -- -- caffe2_binary_target("run_plan.cc") -- caffe2_binary_target("db_throughput.cc") -- -- # ---[ tutorials -- caffe2_binary_target("tutorial_blob.cc") --endif() -- - caffe2_binary_target("parallel_info.cc") - target_include_directories(parallel_info PUBLIC - ${CMAKE_BINARY_DIR}/aten/src) # provides "ATen/TypeExtendedInterface.h" to ATen.h -@@ -44,70 +5,3 @@ target_include_directories(parallel_info PUBLIC - caffe2_binary_target("record_function_benchmark.cc") - target_include_directories(record_function_benchmark PUBLIC - ${CMAKE_BINARY_DIR}/aten/src) -- --caffe2_binary_target("speed_benchmark_torch.cc") --caffe2_binary_target("compare_models_torch.cc") -- --if(BUILD_TEST) -- # Core overhead benchmark -- caffe2_binary_target("core_overhead_benchmark.cc") -- target_link_libraries(core_overhead_benchmark benchmark) --endif() -- --if(USE_CUDA) -- caffe2_binary_target("inspect_gpu.cc") -- target_link_libraries(inspect_gpu ${CUDA_LIBRARIES}) -- caffe2_binary_target("print_core_object_sizes_gpu.cc") -- -- if(BUILD_TEST) -- # Core overhead benchmark -- caffe2_binary_target("core_overhead_benchmark_gpu.cc") -- target_link_libraries(core_overhead_benchmark_gpu benchmark ${CUDA_curand_LIBRARY}) -- endif() --endif() -- --if(USE_ROCM) -- caffe2_hip_binary_target("hip/inspect_gpu.cc") -- caffe2_hip_binary_target("hip/print_core_object_sizes_gpu.cc") -- -- if(BUILD_TEST) -- # Core overhead benchmark -- caffe2_hip_binary_target("hip/core_overhead_benchmark_gpu.cc") -- target_link_libraries(core_overhead_benchmark_gpu benchmark) -- endif() --endif() -- --if(USE_ZMQ) -- caffe2_binary_target("zmq_feeder.cc") -- target_link_libraries(zmq_feeder ${ZMQ_LIBRARIES}) --endif() -- --if(USE_MPI) -- caffe2_binary_target("run_plan_mpi.cc") -- target_link_libraries(run_plan_mpi ${MPI_CXX_LIBRARIES}) --endif() -- --if(USE_OPENCV AND USE_LEVELDB) -- caffe2_binary_target("convert_encoded_to_raw_leveldb.cc") -- target_link_libraries( -- convert_encoded_to_raw_leveldb -- ${OpenCV_LIBS} ${LevelDB_LIBRARIES} ${Snappy_LIBRARIES}) --endif() -- --if(USE_OPENCV) -- caffe2_binary_target("make_image_db.cc") -- target_link_libraries(make_image_db ${OpenCV_LIBS}) -- caffe2_binary_target("convert_image_to_tensor.cc") -- target_link_libraries(convert_image_to_tensor ${OpenCV_LIBS}) --endif() -- --if(USE_OBSERVERS AND USE_OPENCV) -- caffe2_binary_target("convert_and_benchmark.cc") -- target_link_libraries(convert_and_benchmark ${OpenCV_LIBS}) --endif() -- --caffe2_binary_target("dump_operator_names.cc") --caffe2_binary_target("optimize_for_mobile.cc") -- --caffe2_binary_target(aot_model_compiler "aot_model_compiler.cc") --target_link_libraries(aot_model_compiler torch) diff --git a/python-pytorch/pytorch-rocm-jit.patch b/python-pytorch/pytorch-rocm-jit.patch deleted file mode 100644 index 3afb3e43..00000000 --- a/python-pytorch/pytorch-rocm-jit.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- pytorch-rocm/torch/csrc/jit/ir/ir.cpp.bak 2023-07-08 14:23:12.514918311 +0200 -+++ pytorch-rocm/torch/csrc/jit/ir/ir.cpp 2023-07-08 14:23:57.239106350 +0200 -@@ -1186,10 +1186,10 @@ - case prim::rpc_remote: // It represents RPC message sent. - case aten::wait: // It can represent RPC message received. - #if !defined(USE_ROCM) -- case cuda::set_stream: -- case cuda::_set_device: -- case cuda::_current_device: -- case cuda::synchronize: -+ case c10::cuda::set_stream: -+ case c10::cuda::_set_device: -+ case c10::cuda::_current_device: -+ case c10::cuda::synchronize: - #endif - case prim::Enter: - case prim::Exit: diff --git a/python-pytorch/rocblas-batched.patch b/python-pytorch/rocblas-batched.patch deleted file mode 100644 index 1eef5458..00000000 --- a/python-pytorch/rocblas-batched.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/caffe2/utils/math_gpu.cu b/caffe2/utils/math_gpu.cu -index 2906d0acd9..33610c65f7 100644 ---- a/caffe2/utils/math_gpu.cu -+++ b/caffe2/utils/math_gpu.cu -@@ -838,6 +838,24 @@ CAFFE2_CUDA_EXPORT void GemmBatched( - at::Half** C, - CUDAContext* context, - TensorProto::DataType math_type) { -+#if defined(USE_ROCM) -+ // loop over matrices in the batch -+ for (int i = 0; i < batch_size; ++i) { -+ Gemm( -+ trans_A, -+ trans_B, -+ M, -+ N, -+ K, -+ alpha, -+ A[i], -+ B[i], -+ beta, -+ C[i], -+ context, -+ math_type); -+ } -+#else - // Note that cublas follows fortran order, so the order is different from - // the cblas convention. - const int lda = (trans_A == CblasNoTrans) ? K : M; -@@ -912,6 +930,7 @@ CAFFE2_CUDA_EXPORT void GemmBatched( - } else { - CAFFE_THROW("Unsupported math type"); - } -+#endif - } - diff --git a/python-pytorch/test.py b/python-pytorch/test.py deleted file mode 100644 index ad857628..00000000 --- a/python-pytorch/test.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python - -import torch - -d = torch.device('cuda') -a = torch.rand(1, 2).to(d) -print(a + 0) diff --git a/python-pytorch/use-system-libuv.patch b/python-pytorch/use-system-libuv.patch deleted file mode 100644 index d1ec0fca..00000000 --- a/python-pytorch/use-system-libuv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index c3abce52e4c..53e51a861e7 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1381,7 +1381,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) - set(TP_USE_CUDA ON CACHE BOOL "" FORCE) - set(TP_ENABLE_CUDA_IPC ON CACHE BOOL "" FORCE) - endif() -- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE) -+ set(TP_BUILD_LIBUV OFF CACHE BOOL "" FORCE) - add_compile_options(-DTORCH_USE_LIBUV) - include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/tensorpipe/third_party/libuv/include) - set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE) diff --git a/uksmd/README.md b/uksmd/README.md deleted file mode 100644 index 9dd645c6..00000000 --- a/uksmd/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# UKSMD - -### Description of the different versions - -- [uksmd-git](https://github.com/CachyOS/uksmd/commits/master) - for version 6.4 ane newer, git version - -- [uksmd-lts](https://github.com/CachyOS/uksmd/commits/v1.1.0) - preparation for LTS version (6.1) because with the release of 6.4 the uksmd-git version will stop working with kernels < 6.4 diff --git a/uksmd/uksmd-git/.SRCINFO b/uksmd/uksmd-git/.SRCINFO deleted file mode 100644 index b147eea8..00000000 --- a/uksmd/uksmd-git/.SRCINFO +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by makepkg 6.0.2 -# Tue Sep 5 09:39:46 UTC 2023 -pkgbase = uksmd-git - pkgdesc = Userspace KSM helper daemon - pkgver = 1.2.2.r0.g553dc79 - pkgrel = 1 - epoch = 1 - url = https://github.com/CachyOS/uksmd - arch = x86_64 - license = GPL3 - makedepends = meson - makedepends = git - depends = procps-ng - depends = libcap-ng - provides = uksmd - conflicts = uksmd - conflicts = uksmd-lts - source = git+https://github.com/CachyOS/uksmd - sha256sums = SKIP - -pkgname = uksmd-git - depends = procps-ng - depends = libcap-ng - depends = UKSMD-BUILTIN diff --git a/uksmd/uksmd-git/PKGBUILD b/uksmd/uksmd-git/PKGBUILD deleted file mode 100644 index add56125..00000000 --- a/uksmd/uksmd-git/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Piotr Górski -# Contributor: Oleksandr Natalenko -# Contributor: Damian N. - -pkgname=uksmd-git -gitname=uksmd -pkgver=1.2.2.r0.g553dc79 -pkgrel=1 -epoch=1 -pkgdesc="Userspace KSM helper daemon" -url="https://github.com/CachyOS/uksmd" -license=(GPL-3.0-or-later) -arch=('x86_64') -depends=('procps-ng' 'libcap-ng') -makedepends=('meson' 'git') -conflicts=('uksmd' 'uksmd-lts') -provides=('uksmd') -source=('git+https://github.com/CachyOS/uksmd') -sha256sums=('SKIP') - -pkgver() { - cd $gitname - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - cd $gitname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done -} - -build() { - cd $gitname - arch-meson . build - meson compile -C build -} - -package() { - depends+=(UKSMD-BUILTIN) - - cd $gitname - meson install -C build --destdir "${pkgdir}" -} diff --git a/uksmd/uksmd-lts/.SRCINFO b/uksmd/uksmd-lts/.SRCINFO deleted file mode 100644 index 31a721f8..00000000 --- a/uksmd/uksmd-lts/.SRCINFO +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by makepkg 6.0.2 -# Tue Sep 5 09:41:31 UTC 2023 -pkgbase = uksmd-lts - pkgdesc = Userspace KSM helper daemon - pkgver = 1.1.0 - pkgrel = 2 - epoch = 1 - url = https://github.com/CachyOS/uksmd - arch = x86_64 - license = GPL3 - makedepends = meson - depends = libcap-ng - depends = libprocps - provides = uksmd=1.1.0 - conflicts = uksmd - conflicts = uksmd-git - source = https://github.com/CachyOS/uksmd/archive/v1.1.0.tar.gz - source = 0001-uksmdstats-fixes.patch - sha256sums = 170976c3ca559f531d650b5b530a49ac24b61d5df8c2d4cf2fdc0bc08f6a74a2 - sha256sums = 796a3bdc3e5c34a4772c53df415d188707553c31d5734bfb92ed6b8d223d1750 - -pkgname = uksmd-lts - depends = libcap-ng - depends = libprocps - depends = UKSMD-BUILTIN diff --git a/uksmd/uksmd-lts/0001-uksmdstats-fixes.patch b/uksmd/uksmd-lts/0001-uksmdstats-fixes.patch deleted file mode 100644 index 8747720a..00000000 --- a/uksmd/uksmd-lts/0001-uksmdstats-fixes.patch +++ /dev/null @@ -1,371 +0,0 @@ -diff --git a/locale/LINGUAS b/locale/LINGUAS -new file mode 100644 -index 0000000..fefdbf7 ---- /dev/null -+++ b/locale/LINGUAS -@@ -0,0 +1,3 @@ -+de -+pl -+ru -diff --git a/locale/de.po b/locale/de.po -new file mode 100644 -index 0000000..2e62ac8 ---- /dev/null -+++ b/locale/de.po -@@ -0,0 +1,64 @@ -+# ======================== -+# Powered by CachyOS Team -+# ======================== -+# uksmdstats - polish translation -+# This file is distributed under the GPL license. -+# CachyOS Team - Damian N. , 08.07.2023 -+# CachyOS - Peter Jung -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: 1.0\n" -+"POT-Creation-Date: 2023-07-08 17:00+0100\n" -+"PO-Revision-Date: 2023-07-08 17:00+0100\n" -+"Last-Translator: Damian N. \n" -+"Language: de\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+# -+#: myscript:10 -+#, sh-format -+ -+msgid "Full scans" -+msgstr "Komplette Scans" -+ -+msgid "Interval" -+msgstr "Interval" -+ -+msgid "Max page sharing ratio" -+msgstr "Maximale page sharing ratio" -+ -+msgid "Pages to scan" -+msgstr "Seiten zum Scannen" -+ -+msgid "Pages over ratio" -+msgstr "Seiten über rate" -+ -+msgid "Duplicated pages" -+msgstr "Doppelte Seiten" -+ -+msgid "Use zero pages" -+msgstr "Verwenden von Nullseiten" -+ -+msgid "Sharing/shared ratio" -+msgstr "Teilen/geteilt rate" -+ -+msgid "Unshared/sharing ratio" -+msgstr "Ungeteilt/teilen rate" -+ -+msgid "Pages sharing" -+msgstr "Seiten teilen" -+ -+msgid "Pages shared" -+msgstr "Seiten geteilt " -+ -+msgid "Pages unshared" -+msgstr "Seiten ungeteilt" -+ -+msgid "General profit" -+msgstr "Allgemeine Ausbeute" -+ -+msgid "The kernel you are using does not support" -+msgstr "Das Kernel Sie verwenden unterstützt nicht" -diff --git a/locale/meson.build b/locale/meson.build -new file mode 100644 -index 0000000..57d1266 ---- /dev/null -+++ b/locale/meson.build -@@ -0,0 +1 @@ -+i18n.gettext(gettext_package, preset: 'glib') -diff --git a/locale/pl.po b/locale/pl.po -new file mode 100644 -index 0000000..6dcb458 ---- /dev/null -+++ b/locale/pl.po -@@ -0,0 +1,63 @@ -+# ======================== -+# Powered by CachyOS Team -+# ======================== -+# uksmdstats - polish translation -+# This file is distributed under the GPL license. -+# CachyOS Team - Damian N. , 08.07.2023, updated 08.07.2023 -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: 1.0\n" -+"POT-Creation-Date: 2023-07-08 13:00+0100\n" -+"PO-Revision-Date: 2023-07-08 13:00+0100\n" -+"Last-Translator: Damian N. \n" -+"Language: pl\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+# -+#: myscript:10 -+#, sh-format -+ -+msgid "Full scans" -+msgstr "Pełne skany" -+ -+msgid "Interval" -+msgstr "Interwał" -+ -+msgid "Max page sharing ratio" -+msgstr "Maks. wskaźnik stronicowania" -+ -+msgid "Pages to scan" -+msgstr "Strony do skanowania" -+ -+msgid "Pages over ratio" -+msgstr "Strony ponad wskaźnik" -+ -+msgid "Duplicated pages" -+msgstr "Zdublowane strony" -+ -+msgid "Use zero pages" -+msgstr "Użycie stron zerowych" -+ -+msgid "Sharing/shared ratio" -+msgstr "Wskaźnik stron współdzielonych" -+ -+msgid "Unshared/sharing ratio" -+msgstr "Wskaźnik stron niewspółdzielonych" -+ -+msgid "Pages sharing" -+msgstr "Strony dost. do współdzielenia" -+ -+msgid "Pages shared" -+msgstr "Strony współdzielone" -+ -+msgid "Pages unshared" -+msgstr "Strony niewspółdzielone" -+ -+msgid "General profit" -+msgstr "Ogólny zysk" -+ -+msgid "The kernel you are using does not support" -+msgstr "Używane jądro nie wspiera" -diff --git a/locale/ru.po b/locale/ru.po -new file mode 100644 -index 0000000..ab99468 ---- /dev/null -+++ b/locale/ru.po -@@ -0,0 +1,64 @@ -+# ======================== -+# Powered by CachyOS Team -+# ======================== -+# uksmdstats - russian translation -+# This file is distributed under the GPL license. -+# CachyOS Team -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: 1.0\n" -+"POT-Creation-Date: 2023-07-08 13:00+0100\n" -+"PO-Revision-Date: 2023-07-08 18:04+0400\n" -+"Last-Translator: Vladislav Nepogodin \n" -+"Language-Team: \n" -+"Language: ru\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Poedit 3.3.2\n" -+ -+# -+#: myscript:10 -+#, sh-format -+msgid "Full scans" -+msgstr "Полных сканирований" -+ -+msgid "Interval" -+msgstr "Интервал" -+ -+msgid "Max page sharing ratio" -+msgstr "Максимальный коэффициент общих страниц" -+ -+msgid "Pages to scan" -+msgstr "Страниц для сканирования" -+ -+msgid "Pages over ratio" -+msgstr "Соотношение страниц к объему" -+ -+msgid "Duplicated pages" -+msgstr "Дублированные страницы" -+ -+msgid "Use zero pages" -+msgstr "Использовать нулевые страницы" -+ -+msgid "Sharing/shared ratio" -+msgstr "Коэффициент общего/разделеного пользования" -+ -+msgid "Unshared/sharing ratio" -+msgstr "Соотношение необщего/общего пользования" -+ -+msgid "Pages sharing" -+msgstr "Распределение страниц" -+ -+msgid "Pages shared" -+msgstr "Общих страниц" -+ -+msgid "Pages unshared" -+msgstr "Необщих страниц" -+ -+msgid "General profit" -+msgstr "Общий профит" -+ -+msgid "The kernel you are using does not support" -+msgstr "Используемое вами ядро не поддерживает" -diff --git a/locale/uksmdstats.pot b/locale/uksmdstats.pot -new file mode 100644 -index 0000000..e4e6f7b ---- /dev/null -+++ b/locale/uksmdstats.pot -@@ -0,0 +1,63 @@ -+# ======================== -+# Powered by CachyOS Team -+# ======================== -+# uksmdstats - translation -+# This file is distributed under the GPL license. -+# CachyOS Team -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: 1.0\n" -+"POT-Creation-Date: 2023-07-08 13:00+0100\n" -+"PO-Revision-Date: 2023-07-08 13:00+0100\n" -+"Last-Translator: YOUR NAME HERE\n" -+"Language: LANGUAGE CODE\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+# -+#: myscript:10 -+#, sh-format -+ -+msgid "Full scans" -+msgstr "" -+ -+msgid "Interval" -+msgstr "" -+ -+msgid "Max page sharing ratio" -+msgstr "" -+ -+msgid "Pages to scan" -+msgstr "" -+ -+msgid "Pages over ratio" -+msgstr "" -+ -+msgid "Duplicated pages" -+msgstr "" -+ -+msgid "Use zero pages" -+msgstr "" -+ -+msgid "Sharing/shared ratio" -+msgstr "" -+ -+msgid "Unshared/sharing ratio" -+msgstr "" -+ -+msgid "Pages sharing" -+msgstr "" -+ -+msgid "Pages shared" -+msgstr "" -+ -+msgid "Pages unshared" -+msgstr "" -+ -+msgid "General profit" -+msgstr "" -+ -+msgid "The kernel you are using does not support" -+msgstr "" -diff --git a/meson.build b/meson.build -index 301c6e4..8171730 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,9 @@ build_args = [ - '-DPROJECT_VERSION=' + meson.project_version(), - ] - -+i18n = import('i18n') - systemd = dependency('systemd', required: false) -+gettext_package = 'uksmdstats' - - if systemd.found() - systemd_system_unit_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir') -@@ -56,6 +58,8 @@ install_data( - install_dir: '/usr/share/licenses/uksmd' - ) - -+subdir('locale') -+ - project_target = executable( - meson.project_name(), - project_source_files, -diff --git a/uksmdstats b/uksmdstats -index 0bea750..f70df65 100755 ---- a/uksmdstats -+++ b/uksmdstats -@@ -1,14 +1,39 @@ - #!/bin/sh -+export TEXTDOMAIN='uksmdstats' -+export TEXTDOMAINDIR='/usr/share/locale' -+ - if [ -f /sys/kernel/pmadv/ksm ]; then --echo -e "======================================================" --echo -e "uksmd with uksmdstats support. Powered by CachyOS Team" --echo -e "======================================================" --echo -e "Full scans:\t\t$(cat /sys/kernel/mm/ksm/full_scans)" --echo -e "Max page sharing:\t$(cat /sys/kernel/mm/ksm/max_page_sharing)" --echo -e "Pages to scan:\t\t$(cat /sys/kernel/mm/ksm/pages_to_scan)\n" --echo -e "Pages shared:\t\t$(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_shared)\tMiB" --echo -e "Pages unshared:\t\t$(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_unshared)\tMiB" --echo -e "Pages sharing:\t\t$(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_sharing)\tMiB" -+ echo "======================================================" -+ echo "uksmd with uksmdstats support. Powered by CachyOS Team" -+ echo "======================================================" -+ while true; do -+ echo "$( gettext "Full scans" ): $(cat /sys/kernel/mm/ksm/full_scans)" -+ echo "$( gettext "Interval" ): $(cat /sys/kernel/mm/ksm/sleep_millisecs)" ms -+ echo ":" -+ echo "$( gettext "Max page sharing ratio" ): $(cat /sys/kernel/mm/ksm/max_page_sharing)" -+ echo "$( gettext "Pages to scan" ): $(cat /sys/kernel/mm/ksm/pages_to_scan)" -+ echo "$( gettext "Pages over ratio" ): $(cat /sys/kernel/mm/ksm/stable_node_chains)" -+ echo "$( gettext "Duplicated pages" ): $(cat /sys/kernel/mm/ksm/stable_node_dups)" -+ echo "$( gettext "Use zero pages" ): $(cat /sys/kernel/mm/ksm/use_zero_pages)" -+ if [ "$(cat /sys/kernel/mm/ksm/pages_shared)" -gt 0 ] && [ "$(cat /sys/kernel/mm/ksm/pages_sharing)" -gt 0 ]; then -+ echo "$( gettext "Sharing/shared ratio" ): $(awk "BEGIN {x=$(cat /sys/kernel/mm/ksm/pages_sharing);y=$(cat /sys/kernel/mm/ksm/pages_shared);print x/y}")" -+ echo "$( gettext "Unshared/sharing ratio" ): $(awk "BEGIN {x=$(cat /sys/kernel/mm/ksm/pages_unshared);y=$(cat /sys/kernel/mm/ksm/pages_sharing);print x/y}")" -+ else -+ echo "$( gettext "Sharing/shared ratio" ): 0" -+ echo "$( gettext "Unshared/sharing ratio" ): 0" -+ fi -+ echo ":" -+ # formula MiB: $page_value * page size in Bytes / (1024 * 1024) -+ # = $page_value * 4096 / (1024 / 1024) = $page_value / 256 (MiB) -+ echo "$( gettext "Pages sharing" ): $(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_sharing):MiB" -+ echo "$( gettext "Pages shared" ): $(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_shared):MiB" -+ echo "$( gettext "Pages unshared" ): $(awk '{ print($0 / 256) }' /sys/kernel/mm/ksm/pages_unshared):MiB" -+ echo ":" -+ # https://www.kernel.org/doc/Documentation/admin-guide/mm/ksm.rst -+ # general_profit =~ pages_sharing * sizeof(page) - (all_rmap_items) * sizeof(rmap_item); -+ echo "$( gettext "General profit" ): $(awk '{ print($0 / 1024 / 1024) }' /sys/kernel/mm/ksm/general_profit):MiB" -+ break -+ done | column -t -s':' - else --echo -e "The kernel you are using does not support UKSMD." -+ echo -e "$( gettext "The kernel you are using does not support" ) UKSMD." - fi diff --git a/uksmd/uksmd-lts/PKGBUILD b/uksmd/uksmd-lts/PKGBUILD deleted file mode 100644 index 258dade0..00000000 --- a/uksmd/uksmd-lts/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Piotr Górski -# Contributor: Oleksandr Natalenko -# Contributor: Damian N. - -pkgname=uksmd-lts -_pkgname=uksmd -pkgver=1.1.0 -pkgrel=2 -epoch=1 -pkgdesc="Userspace KSM helper daemon" -url="https://github.com/CachyOS/uksmd" -license=(GPL-3.0-or-later) -arch=('x86_64') -depends=('libcap-ng' 'libprocps') -makedepends=('meson') -conflicts=('uksmd' 'uksmd-git') -provides=("uksmd=${pkgver}") -source=("$url/archive/v$pkgver.tar.gz" - '0001-uksmdstats-fixes.patch') -sha256sums=('170976c3ca559f531d650b5b530a49ac24b61d5df8c2d4cf2fdc0bc08f6a74a2' - '796a3bdc3e5c34a4772c53df415d188707553c31d5734bfb92ed6b8d223d1750') - -prepare() { - cd $_pkgname-$pkgver - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done -} - -build() { - cd $_pkgname-$pkgver - arch-meson . build - meson compile -C build -} - -package() { - depends+=(UKSMD-BUILTIN) - - cd $_pkgname-$pkgver - meson install -C build --destdir "${pkgdir}" -}