Commit cec76273 authored by narugo1992's avatar narugo1992
Browse files

Merge branch 'main' into dev/waifu2x

parents d9d3e5bd 8c204738

.github/workflows/doc.yml

+0 −4
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ jobs: 
        if: ${{ github.event_name == 'push' }}

        env:

          CI: 'true'

          HF_NARUGO_USERNAME: ${{ secrets.HF_NARUGO_USERNAME }}

          HF_NARUGO_PASSWORD: ${{ secrets.HF_NARUGO_PASSWORD }}

        with:

          shell: bash

          timeout_minutes: 20
@@ -122,8 +120,6 @@ jobs: 
        uses: nick-fields/retry@v2

        env:

          CI: 'true'

          HF_NARUGO_USERNAME: ${{ secrets.HF_NARUGO_USERNAME }}

          HF_NARUGO_PASSWORD: ${{ secrets.HF_NARUGO_PASSWORD }}

        with:

          shell: bash

          timeout_minutes: 20

.github/workflows/export.yml

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ jobs: 
        uses: nick-fields/retry@v2

        env:

          CI: 'true'

          HF_NARUGO_USERNAME: ${{ secrets.HF_NARUGO_USERNAME }}

          HF_NARUGO_PASSWORD: ${{ secrets.HF_NARUGO_PASSWORD }}

        with:

          shell: bash

          timeout_minutes: 20

.github/workflows/test.yml

+0 −2
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ jobs: 
        uses: nick-fields/retry@v2

        env:

          CI: 'true'

          HF_NARUGO_USERNAME: ${{ secrets.HF_NARUGO_USERNAME }}

          HF_NARUGO_PASSWORD: ${{ secrets.HF_NARUGO_PASSWORD }}

        with:

          shell: bash

          timeout_minutes: 20

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ pdocs: 
dataset:

	mkdir -p ${DATASET_DIR}

	if [ ! -d ${DATASET_DIR}/chafen_arknights ]; then \

		git clone https://${HF_NARUGO_USERNAME}:${HF_NARUGO_PASSWORD}@huggingface.co/datasets/deepghs/chafen_arknights.git ${DATASET_DIR}/chafen_arknights; \

		git clone https://huggingface.co/datasets/deepghs/chafen_arknights.git ${DATASET_DIR}/chafen_arknights; \

	fi

	if [ ! -d ${DATASET_DIR}/monochrome_danbooru ]; then \

		git clone https://${HF_NARUGO_USERNAME}:${HF_NARUGO_PASSWORD}@huggingface.co/datasets/deepghs/monochrome_danbooru.git ${DATASET_DIR}/monochrome_danbooru; \

		git clone https://huggingface.co/datasets/deepghs/monochrome_danbooru.git ${DATASET_DIR}/monochrome_danbooru; \

	fi

	if [ ! -d ${DATASET_DIR}/images_test_v1 ]; then \

		mkdir -p ${DATASET_DIR}/images_test_v1 && \

docs/source/_libs/plot.py

+9 −0
Original line number Diff line number Diff line 
from typing import Tuple, List



import matplotlib.pyplot as plt

import numpy as np

from PIL import Image



from cli import _wrap_func_as_cli
@@ -44,6 +45,14 @@ def image_plot(*images, save_as: str, columns=2, keep_axis: bool = False, figsiz 
    n = len(images)

    rows = (n + columns - 1) // columns

    fig, axs = plt.subplots(rows, columns, figsize=figsize)

    if rows == 1 and columns == 1:

        axs = np.array([[axs]])

    elif rows == 1:

        axs = axs[None, ...]

    elif columns == 1:

        axs = axs[..., None]

    else:

        pass

    plt.subplots_adjust(wspace=0.2, hspace=0.15)

    for i, img in enumerate(images, start=0):

        xi, yi = i // columns, i % columns