Skip to content
Merged
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
37 changes: 37 additions & 0 deletions src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,43 @@ button:active {
background-color: #95a5a6;
}

.dimension-color-select {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin-top: 1rem;
padding: 0.75rem;
background-color: #f8f9fa;
border: 1px solid #e9ecef;
border-radius: 4px;
font-size: 0.9rem;
color: #555;
font-weight: 500;
}

.dimension-color-select select {
margin-top: 0.25rem;
padding: 0.5rem;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 0.9rem;
background-color: white;
cursor: pointer;
transition: border-color 0.2s, box-shadow 0.2s;
}

.dimension-color-select select:focus {
outline: none;
border-color: #3498db;
box-shadow: 0 0 0 3px rgba(52, 152, 219, 0.1);
}

.dimension-color-select select:disabled {
background-color: #f8f9fa;
cursor: not-allowed;
opacity: 0.6;
}

.dimension-list {
display: flex;
flex-direction: column;
Expand Down
116 changes: 114 additions & 2 deletions src/tabs/LinearLayoutTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export class LinearLayoutTab extends CanvasTab {
private readonly dimensionAddButtons: Record<DimensionType, HTMLButtonElement>
private readonly matrixEditor: LinearLayoutMatrixEditor
private readonly layoutStatus: HTMLElement
private readonly colorDimensionSelect: HTMLSelectElement
private dimensionState: Record<DimensionType, LinearDimension[]>
private selectedColorDimensionId: string | null

constructor(tabId: string) {
const tabContent = document.getElementById(tabId)
Expand Down Expand Up @@ -102,8 +104,9 @@ export class LinearLayoutTab extends CanvasTab {
const inputAdd = this.form.querySelector<HTMLButtonElement>('[data-add-dimension="input"]')
const outputAdd = this.form.querySelector<HTMLButtonElement>('[data-add-dimension="output"]')
const matrixButton = this.form.querySelector<HTMLButtonElement>('#linear-edit-matrix')
const colorSelect = this.form.querySelector<HTMLSelectElement>('#linear-color-dimension')

if (!inputList || !outputList || !inputAdd || !outputAdd || !matrixButton) {
if (!inputList || !outputList || !inputAdd || !outputAdd || !matrixButton || !colorSelect) {
throw new Error('LinearLayoutTab dimension controls failed to initialize')
}

Expand All @@ -120,6 +123,11 @@ export class LinearLayoutTab extends CanvasTab {
this.layoutStatus.className = 'layout-status'
this.layoutStatus.setAttribute('role', 'status')
matrixButton.insertAdjacentElement('afterend', this.layoutStatus)
this.colorDimensionSelect = colorSelect
this.selectedColorDimensionId = null
this.colorDimensionSelect.addEventListener('change', () => {
this.handleColorDimensionSelectionChange()
})
this.matrixEditor.onVisibilityChange((isOpen) => {
this.toggleSidebarInteractivity(isOpen)
})
Expand Down Expand Up @@ -190,6 +198,10 @@ export class LinearLayoutTab extends CanvasTab {
<h3>Input Dimensions</h3>
<div class="dimension-list" data-dimension-list="input"></div>
<button type="button" class="dimension-add" data-add-dimension="input">Add Input</button>
<label class="dimension-color-select" for="linear-color-dimension">
Color by input dimension:
<select id="linear-color-dimension"></select>
</label>
</div>

<div class="form-section">
Expand Down Expand Up @@ -256,6 +268,9 @@ export class LinearLayoutTab extends CanvasTab {
})

this.updateAddButtonState(type)
if (type === 'input') {
this.updateColorDimensionOptions()
}
this.syncEditorAndLayout()
}

Expand All @@ -269,6 +284,7 @@ export class LinearLayoutTab extends CanvasTab {
}

private handleDimensionFieldChange(): void {
this.updateColorDimensionOptions()
this.syncEditorAndLayout()
}

Expand Down Expand Up @@ -312,10 +328,12 @@ export class LinearLayoutTab extends CanvasTab {
private updateRendererFromLayout(): void {
const tensorShape = this.deriveTensorShape()
this.params.tensorShape = tensorShape
const selectedDimension = this.getSelectedColorDimensionName()

const renderer = this.getRenderer()
if (renderer) {
renderer.updateLayout(this.layout, this.params)
renderer.setColorByInputDimension(selectedDimension)
return
}

Expand All @@ -324,7 +342,12 @@ export class LinearLayoutTab extends CanvasTab {
this.layout,
this.params,
undefined,
{ colorGrouping: 'thread', traversalMode: 'by-output', showCellText: false }
{
colorGrouping: 'thread',
traversalMode: 'by-output',
showCellText: false,
colorInputDimension: selectedDimension,
}
)
this.setRenderer(newRenderer)
newRenderer.render()
Expand Down Expand Up @@ -397,6 +420,95 @@ export class LinearLayoutTab extends CanvasTab {
this.sidebar.insertBefore(infoBlock, controlsContainer)
}

private updateColorDimensionOptions(): void {
const select = this.colorDimensionSelect
const dimensions = this.dimensionState.input

select.innerHTML = ''

if (dimensions.length === 0) {
const placeholder = document.createElement('option')
placeholder.value = ''
placeholder.textContent = 'No input dimensions'
select.appendChild(placeholder)
select.disabled = true
this.selectedColorDimensionId = null
this.applySelectedColorDimension()
return
}

select.disabled = false
dimensions.forEach((dimension) => {
const option = document.createElement('option')
option.value = dimension.id
option.textContent = this.getDimensionOptionLabel(dimension)
select.appendChild(option)
})

const selectionStillValid = this.selectedColorDimensionId &&
dimensions.some((dimension) => dimension.id === this.selectedColorDimensionId)
? this.selectedColorDimensionId
: null

const defaultSelection = this.getDefaultColorDimensionId(dimensions)
const nextSelection = selectionStillValid ?? defaultSelection ?? dimensions[0]?.id ?? null

if (nextSelection) {
this.selectedColorDimensionId = nextSelection
select.value = nextSelection
} else {
select.selectedIndex = 0
this.selectedColorDimensionId = null
}

this.applySelectedColorDimension()
}

private getDimensionOptionLabel(dimension: LinearDimension): string {
const trimmed = dimension.name.trim()
if (trimmed.length > 0) {
return trimmed
}
if (dimension.name.length > 0) {
return dimension.name
}
return 'unnamed'
}

private getDefaultColorDimensionId(dimensions: LinearDimension[]): string | undefined {
const preferred = dimensions.find((dimension) => dimension.name.trim().toLowerCase() === 'thread')
if (preferred) {
return preferred.id
}
return dimensions[0]?.id
}

private handleColorDimensionSelectionChange(): void {
const value = this.colorDimensionSelect.value
this.selectedColorDimensionId = value || null
this.applySelectedColorDimension()
}

private getSelectedColorDimensionName(): string | undefined {
if (!this.selectedColorDimensionId) {
return undefined
}
const dimension = this.dimensionState.input.find((item) => item.id === this.selectedColorDimensionId)
if (!dimension) {
return undefined
}
const trimmed = dimension.name.trim()
return trimmed.length > 0 ? trimmed : undefined
}

private applySelectedColorDimension(): void {
const renderer = this.getRenderer()
if (!renderer) {
return
}
renderer.setColorByInputDimension(this.getSelectedColorDimensionName())
}

private getDefaultName(type: DimensionType): string {
const prefix = type === 'input' ? 'input' : 'output'
return `${prefix}${this.dimensionState[type].length + 1}`
Expand Down
38 changes: 38 additions & 0 deletions src/visualization/CanvasRenderer.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, it, expect, beforeEach, vi } from 'vitest'
import { CanvasRenderer, type PositionResolver } from './CanvasRenderer'
import { ColorScheme } from './ColorScheme'
import { createBlockLayout } from '../layouts/BlockLayout'
import type { BlockLayoutParams } from '../validation/InputValidator'
import { LinearLayout } from '../core/LinearLayout'
Expand Down Expand Up @@ -114,6 +115,43 @@ describe('CanvasRenderer', () => {
expect(color0).not.toBe(color1)
expect(scheme.getColorForThread(0)).toBe(color0)
})

it('should color cells by a selected input dimension when provided', () => {
const layout = LinearLayout.identity1D(4, 'thread', 'dim0').multiply(
LinearLayout.identity1D(4, 'lane', 'dim1')
)
const params: BlockLayoutParams = {
sizePerThread: [1, 1] as [number, number],
threadsPerWarp: [4, 1] as [number, number],
warpsPerCTA: [1, 1] as [number, number],
order: [0, 1] as [number, number],
tensorShape: [4, 4] as [number, number],
}

const warpSpy = vi.spyOn(ColorScheme.prototype, 'getColorForWarp')
const threadSpy = vi.spyOn(ColorScheme.prototype, 'getColorForThread')

const renderer = new CanvasRenderer(
canvas,
layout,
params,
undefined,
{
traversalMode: 'by-output',
colorGrouping: 'thread',
showCellText: false,
colorInputDimension: 'lane',
}
)

renderer.render()

expect(warpSpy).toHaveBeenCalled()
expect(threadSpy).not.toHaveBeenCalled()

warpSpy.mockRestore()
threadSpy.mockRestore()
})
})

describe('viewport integration', () => {
Expand Down
Loading