Skip to content

[BE] add move folders and move common components in the torchci/component/common #6450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion torchci/components/additionalTestInfo/TestCounts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DataGrid, GridRenderCellParams } from "@mui/x-data-grid";
import { durationDisplay } from "components/TimeUtils";
import { durationDisplay } from "components/common/TimeUtils";
import { fetcher } from "lib/GeneralUtils";
import { JobData } from "lib/types";
import _ from "lodash";
Expand Down
4 changes: 2 additions & 2 deletions torchci/components/benchmark/llms/LLMsBenchmarkPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
LAST_N_DAYS,
MAIN_BRANCH,
} from "components/benchmark/common";
import CopyLink from "components/CopyLink";
import CopyLink from "components/common/CopyLink";
import { Granularity } from "components/metrics/panels/TimeSeriesPanel";
import dayjs from "dayjs";
import _, { cloneDeep } from "lodash";
Expand All @@ -13,7 +13,7 @@ import { ParsedUrlQuery } from "querystring";
import { useEffect, useReducer, useState } from "react";
import { propsReducer } from "./context/BenchmarkProps";

import LoadingPage from "components/LoadingPage";
import LoadingPage from "components/common/LoadingPage";
import {
DEFAULT_ARCH_NAME,
DEFAULT_BACKEND_NAME,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GranularityPicker from "components/GranularityPicker";
import GranularityPicker from "components/common/GranularityPicker";
import { TimeRangePicker } from "pages/metrics";
import { Dispatch } from "react";
export const LLMsTimeRangePicker = ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styles from "components/commit.module.css";
import styles from "components/commit/commit.module.css";
import {
isFailedJob,
isRerunDisabledTestsJob,
Expand All @@ -9,9 +9,9 @@ import useScrollTo from "lib/useScrollTo";
import _ from "lodash";
import { useState } from "react";
import { linkIt, UrlComponent, urlRegex } from "react-linkify-it";
import { getConclusionSeverityForSorting } from "../lib/JobClassifierUtil";
import FilteredJobList from "./FilteredJobList";
import { JobStatus } from "./GroupJobConclusion";
import { getConclusionSeverityForSorting } from "../../lib/JobClassifierUtil";
import FilteredJobList from "../job/FilteredJobList";
import { JobStatus } from "../job/GroupJobConclusion";
import VersionControlLinks from "./VersionControlLinks";
import WorkflowBox from "./WorkflowBox";
import WorkflowDispatcher from "./WorkflowDispatcher";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, styled } from "@mui/material";
import styles from "components/commit.module.css";
import styles from "components/commit/commit.module.css";
import { fetcher } from "lib/GeneralUtils";
import { isFailedJob } from "lib/jobUtils";
import { getSearchRes, LogSearchResult } from "lib/searchLogs";
Expand All @@ -10,12 +10,12 @@ import {
} from "lib/utilization/types";
import React, { useEffect, useState } from "react";
import useSWR from "swr";
import { getConclusionSeverityForSorting } from "../lib/JobClassifierUtil";
import { TestInfo } from "./additionalTestInfo/TestInfo";
import JobArtifact from "./JobArtifact";
import JobSummary from "./JobSummary";
import LogViewer, { SearchLogViewer } from "./LogViewer";
import { durationDisplay } from "./TimeUtils";
import { getConclusionSeverityForSorting } from "../../lib/JobClassifierUtil";
import { TestInfo } from "../additionalTestInfo/TestInfo";
import LogViewer, { SearchLogViewer } from "../common/log/LogViewer";
import { durationDisplay } from "../common/TimeUtils";
import JobArtifact from "../job/JobArtifact";
import JobSummary from "../job/JobSummary";

function sortJobsByConclusion(jobA: JobData, jobB: JobData): number {
// Show failed jobs first, then pending jobs, then successful jobs
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ToggleButton, ToggleButtonGroup } from "@mui/material";
import { useSession } from "next-auth/react";
import React from "react";
import { JobData, LogAnnotation } from "../lib/types";
import { JobData, LogAnnotation } from "../../../lib/types";

export default function LogAnnotationToggle({
job,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { IssueData, JobAnnotation, JobData } from "lib/types";
import useScrollTo from "lib/useScrollTo";
import { useRouter } from "next/router";
import useSWR from "swr";
import LogViewer from "../common/log/LogViewer";
import JobAnnotationToggle from "./JobAnnotationToggle";
import JobLinks from "./JobLinks";
import JobSummary from "./JobSummary";
import LogViewer from "./LogViewer";

function FailedJobInfo({
job,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TooltipTarget from "components/TooltipTarget";
import TooltipTarget from "components/common/tooltipTarget/TooltipTarget";
import { getGroupConclusionChar } from "lib/JobClassifierUtil";
import {
isFailedJob,
Expand All @@ -11,10 +11,10 @@ import {
PinnedTooltipContext,
} from "pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]";
import { useContext } from "react";
import hudStyles from "./hud.module.css";
import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher";
import hudStyles from "../hud.module.css";
import { getFailureEl } from "./JobConclusion";
import styles from "./JobConclusion.module.css";
import { SingleWorkflowDispatcher } from "./WorkflowDispatcher";

export enum JobStatus {
Success = "success",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ToggleButton, ToggleButtonGroup } from "@mui/material";
import _ from "lodash";
import { useSession } from "next-auth/react";
import React from "react";
import { JobAnnotation, JobData } from "../lib/types";
import { JobAnnotation, JobData } from "../../lib/types";

export default function JobAnnotationToggle({
job,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getConclusionChar } from "lib/JobClassifierUtil";
import { useContext } from "react";
import { JobData } from "../lib/types";
import { MonsterFailuresContext } from "../pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]";
import { JobData } from "../../lib/types";
import { MonsterFailuresContext } from "../../pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]";
import { JobStatus } from "./GroupJobConclusion";
import styles from "./JobConclusion.module.css";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import dayjs from "dayjs";
import { useSession } from "next-auth/react";
import { IssueLabelApiResponse } from "pages/api/issue/[label]";
import useSWR from "swr";
import { isFailure, IsJobInProgress } from "../lib/JobClassifierUtil";
import { isFailedJob, transformJobName } from "../lib/jobUtils";
import { IssueData, JobData } from "../lib/types";
import CopyLink from "./CopyLink";
import { isFailure, IsJobInProgress } from "../../lib/JobClassifierUtil";
import { isFailedJob, transformJobName } from "../../lib/jobUtils";
import { IssueData, JobData } from "../../lib/types";
import CopyLink from "../common/CopyLink";
import { durationDisplay, LocalTimeHuman } from "../common/TimeUtils";
import styles from "./JobLinks.module.css";
import ReproductionCommand from "./ReproductionCommand";
import { durationDisplay, LocalTimeHuman } from "./TimeUtils";

const DEFAULT_REPO = "pytorch/pytorch";
function getRepoFromHtmlURL(htmlUrl?: string) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { JobData } from "../lib/types";
import { JobData } from "../../lib/types";
import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher";
import LogViewer from "../common/log/LogViewer";
import JobLinks from "./JobLinks";
import LogViewer from "./LogViewer";
import { SingleWorkflowDispatcher } from "./WorkflowDispatcher";

export default function JobTooltip({
job,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IsJobInProgress } from "lib/JobClassifierUtil";
import { useEffect, useState } from "react";
import { JobData } from "../lib/types";
import CopyLink from "./CopyLink";
import { JobData } from "../../lib/types";
import CopyLink from "../common/CopyLink";
import { getTestName } from "./JobLinks";

export default function ReproductionCommand({ job }: { job: JobData }) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import styles from "components/NavBar.module.css";
import styles from "components/layout/NavBar.module.css";
import Link from "next/link";
import { useState } from "react";
import { AiFillGithub } from "react-icons/ai";
import ThemeModePicker from "../common/ThemeModePicker";
import LoginSection from "./LoginSection";
import ThemeModePicker from "./ThemeModePicker";

const NavBarDropdown = ({
title,
Expand Down
5 changes: 4 additions & 1 deletion torchci/components/metrics/panels/TimeSeriesPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
*/

import { Paper, Skeleton } from "@mui/material";
import { formatTimeForCharts, TIME_DISPLAY_FORMAT } from "components/TimeUtils";
import {
formatTimeForCharts,
TIME_DISPLAY_FORMAT,
} from "components/common/TimeUtils";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { EChartsOption } from "echarts";
Expand Down
2 changes: 1 addition & 1 deletion torchci/lib/JobClassifierUtil.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GroupedJobStatus, JobStatus } from "components/GroupJobConclusion";
import { GroupedJobStatus, JobStatus } from "components/job/GroupJobConclusion";
import { getOpenUnstableIssues } from "lib/jobUtils";
import { IssueData, RowData } from "./types";

Expand Down
4 changes: 2 additions & 2 deletions torchci/pages/[repoOwner]/[repoName]/commit/[sha].tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import CommitStatus from "components/CommitStatus";
import { useSetTitle } from "components/DynamicTitle";
import CommitStatus from "components/commit/CommitStatus";
import { useSetTitle } from "components/layout/DynamicTitle";
import { fetcher } from "lib/GeneralUtils";
import { useRouter } from "next/router";
import { CommitApiResponse } from "pages/api/[repoOwner]/[repoName]/commit/[sha]";
Expand Down
8 changes: 4 additions & 4 deletions torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Stack } from "@mui/material";
import CommitStatus from "components/CommitStatus";
import DrCIButton from "components/DrCIButton";
import { useSetTitle } from "components/DynamicTitle";
import ErrorBoundary from "components/ErrorBoundary";
import CommitStatus from "components/commit/CommitStatus";
import DrCIButton from "components/common/DrCIButton";
import ErrorBoundary from "components/common/ErrorBoundary";
import { useSetTitle } from "components/layout/DynamicTitle";
import { PRData } from "lib/types";
import { useRouter } from "next/router";
import { CommitApiResponse } from "pages/api/[repoOwner]/[repoName]/commit/[sha]";
Expand Down
8 changes: 4 additions & 4 deletions torchci/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import { Analytics } from "@vercel/analytics/react";
import AnnouncementBanner from "components/AnnouncementBanner";
import TitleProvider from "components/DynamicTitle";
import NavBar from "components/NavBar";
import SevReport from "components/SevReport";
import AnnouncementBanner from "components/layout/AnnouncementBanner";
import TitleProvider from "components/layout/DynamicTitle";
import NavBar from "components/layout/NavBar";
import SevReport from "components/servReport/SevReport";
import { DarkModeProvider } from "lib/DarkModeContext";
import { track } from "lib/track";
import { SessionProvider } from "next-auth/react";
Expand Down
4 changes: 2 additions & 2 deletions torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import {
MODES,
} from "components/benchmark/ModeAndDTypePicker";
import { QUANTIZATIONS } from "components/benchmark/torchao/common";
import CopyLink from "components/CopyLink";
import GranularityPicker from "components/GranularityPicker";
import CopyLink from "components/common/CopyLink";
import GranularityPicker from "components/common/GranularityPicker";
import { Granularity } from "components/metrics/panels/TimeSeriesPanel";
import dayjs from "dayjs";
import {
Expand Down
4 changes: 2 additions & 2 deletions torchci/pages/benchmark/compilers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
ModePicker,
MODES,
} from "components/benchmark/ModeAndDTypePicker";
import CopyLink from "components/CopyLink";
import GranularityPicker from "components/GranularityPicker";
import CopyLink from "components/common/CopyLink";
import GranularityPicker from "components/common/GranularityPicker";
import { Granularity } from "components/metrics/panels/TimeSeriesPanel";
import dayjs from "dayjs";
import { augmentData } from "lib/benchmark/compilerUtils";
Expand Down
4 changes: 2 additions & 2 deletions torchci/pages/benchmark/torchao.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
QUANTIZATIONS,
} from "components/benchmark/torchao/common";
import { SUITES } from "components/benchmark/torchao/SuitePicker";
import CopyLink from "components/CopyLink";
import GranularityPicker from "components/GranularityPicker";
import CopyLink from "components/common/CopyLink";
import GranularityPicker from "components/common/GranularityPicker";
import { Granularity } from "components/metrics/panels/TimeSeriesPanel";
import dayjs from "dayjs";
import { convertToCompilerPerformanceData } from "lib/benchmark/compilerUtils";
Expand Down
7 changes: 5 additions & 2 deletions torchci/pages/build_time_metrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import {
} from "@mui/material";
import { BarChart } from "@mui/x-charts";
import CheckBoxList from "components/common/CheckBoxList";
import LoadingPage from "components/LoadingPage";
import LoadingPage from "components/common/LoadingPage";
import {
durationDisplay,
formatTimeForCharts,
} from "components/common/TimeUtils";
import { TimeSeriesPanelWithData } from "components/metrics/panels/TimeSeriesPanel";
import { durationDisplay, formatTimeForCharts } from "components/TimeUtils";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { useClickHouseAPIImmutable } from "lib/GeneralUtils";
Expand Down
4 changes: 2 additions & 2 deletions torchci/pages/cost_analysis.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import {
} from "@mui/material";
import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import CopyLink from "components/CopyLink";
import CopyLink from "components/common/CopyLink";
import MultiSelectPicker from "components/common/MultiSelectPicker";
import TimeSeriesPanel, {
ChartType,
Granularity,
} from "components/metrics/panels/TimeSeriesPanel";
import MultiSelectPicker from "components/MultiSelectPicker";
import dayjs from "dayjs";
import { fetcher } from "lib/GeneralUtils";
import _ from "lodash";
Expand Down
6 changes: 3 additions & 3 deletions torchci/pages/disabled.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Grid2, Stack, Typography } from "@mui/material";
import { GridCellParams, GridRenderCellParams } from "@mui/x-data-grid";
import CopyLink from "components/CopyLink";
import GranularityPicker from "components/GranularityPicker";
import CopyLink from "components/common/CopyLink";
import GranularityPicker from "components/common/GranularityPicker";
import ValuePicker from "components/common/ValuePicker";
import styles from "components/metrics.module.css";
import { TablePanelWithData } from "components/metrics/panels/TablePanel";
import TimeSeriesPanel, {
Granularity,
} from "components/metrics/panels/TimeSeriesPanel";
import ValuePicker from "components/ValuePicker";
import dayjs from "dayjs";
import { fetcher } from "lib/GeneralUtils";
import _ from "lodash";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Skeleton, Stack, Typography } from "@mui/material";
import JobAnnotationToggle from "components/JobAnnotationToggle";
import JobLinks from "components/JobLinks";
import JobSummary from "components/JobSummary";
import LogViewer from "components/LogViewer";
import LogViewer from "components/common/log/LogViewer";
import JobAnnotationToggle from "components/job/JobAnnotationToggle";
import JobLinks from "components/job/JobLinks";
import JobSummary from "components/job/JobSummary";
import dayjs from "dayjs";
import { fetcher } from "lib/GeneralUtils";
import { isRerunDisabledTestsJob, isUnstableJob } from "lib/jobUtils";
Expand Down
10 changes: 5 additions & 5 deletions torchci/pages/failure.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Button, TextField } from "@mui/material";
import { Box, Stack } from "@mui/system";
import CheckBoxSelector from "components/CheckBoxSelector";
import JobLinks from "components/JobLinks";
import JobSummary from "components/JobSummary";
import LoadingPage from "components/LoadingPage";
import LogViewer from "components/LogViewer";
import CheckBoxSelector from "components/common/CheckBoxSelector";
import LoadingPage from "components/common/LoadingPage";
import LogViewer from "components/common/log/LogViewer";
import JobLinks from "components/job/JobLinks";
import JobSummary from "components/job/JobSummary";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { encodeParams } from "lib/GeneralUtils";
Expand Down
24 changes: 12 additions & 12 deletions torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import CheckBoxSelector from "components/CheckBoxSelector";
import CopyLink from "components/CopyLink";
import CheckBoxSelector from "components/common/CheckBoxSelector";
import CopyLink from "components/common/CopyLink";
import LoadingPage from "components/common/LoadingPage";
import PageSelector from "components/common/PageSelector";
import { LocalTimeHuman } from "components/common/TimeUtils";
import TooltipTarget from "components/common/tooltipTarget/TooltipTarget";
import styles from "components/hud.module.css";
import {
GroupHudTableColumns,
GroupHudTableHeader,
passesGroupFilter,
} from "components/GroupHudTableHeaders";
import HudGroupedCell from "components/GroupJobConclusion";
import styles from "components/hud.module.css";
import JobConclusion from "components/JobConclusion";
import JobFilterInput from "components/JobFilterInput";
import JobTooltip from "components/JobTooltip";
import LoadingPage from "components/LoadingPage";
import PageSelector from "components/PageSelector";
import { LocalTimeHuman } from "components/TimeUtils";
import TooltipTarget from "components/TooltipTarget";
} from "components/hud/GroupHudTableHeaders";
import HudGroupedCell from "components/job/GroupJobConclusion";
import JobConclusion from "components/job/JobConclusion";
import JobFilterInput from "components/job/JobFilterInput";
import JobTooltip from "components/job/JobTooltip";
import { fetcher } from "lib/GeneralUtils";
import {
getGroupingData,
Expand Down
2 changes: 1 addition & 1 deletion torchci/pages/metrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import {
import { GridRenderCellParams } from "@mui/x-data-grid";
import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import { durationDisplay } from "components/common/TimeUtils";
import ScalarPanel, {
ScalarPanelWithValue,
} from "components/metrics/panels/ScalarPanel";
import TablePanel from "components/metrics/panels/TablePanel";
import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel";
import { durationDisplay } from "components/TimeUtils";
import dayjs from "dayjs";
import { EChartsOption } from "echarts";
import ReactECharts from "echarts-for-react";
Expand Down
Loading