Skip to content

Commit 2cebdbd

Browse files
committed
Remove debugs
1 parent 1367091 commit 2cebdbd

File tree

5 files changed

+4
-56
lines changed

5 files changed

+4
-56
lines changed

.github/scripts/extract_matrix.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,11 @@
2424
"enterprise",
2525
"corporate-compliance",
2626

27-
# Jobs failing in GitHub Actions:buffer overflow, out of memory, auditwheel incompatible with runner ubuntu-latest's glibc version
27+
# Jobs failing in GitHub Actions:buffer overflow, out of memory
2828
"python-svm-unittest",
2929
"cpython-gate",
3030

31-
# Python 3.8.10 (matrix.python_version) is not available for linux aarch64
32-
# cf. https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
33-
#"linux-aarch64",
34-
35-
# WIP
3631
"darwin",
37-
#"windows"
3832
)
3933

4034
DOWNLOADS_LINKS = {

.github/workflows/ci-matrix-gen.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -190,42 +190,6 @@ jobs:
190190
run: |
191191
${{ matrix.setup_steps }}
192192
193-
- name: Check disk space and memory usage
194-
if: ${{ runner.os == 'macOS' }}
195-
run: |
196-
echo "before purge"
197-
df -h
198-
pagesize=$(sysctl -n hw.pagesize)
199-
vm_stat
200-
vm_stat | awk -v ps=$pagesize '
201-
/Pages free/ {free=$3}
202-
/Pages active/ {active=$3}
203-
/Pages inactive/ {inactive=$3}
204-
/Pages speculative/ {speculative=$3}
205-
/Pages wired/ {wired=$4}
206-
END {
207-
used=(active+inactive+wired+speculative)*ps/1024/1024;
208-
free=free*ps/1024/1024;
209-
printf "Used: %.2f MB\nFree: %.2f MB\n", used, free
210-
}'
211-
ps aux | sort -nrk 4 | head
212-
sudo purge
213-
echo "after purge"
214-
pagesize=$(sysctl -n hw.pagesize)
215-
vm_stat
216-
vm_stat | awk -v ps=$pagesize '
217-
/Pages free/ {free=$3}
218-
/Pages active/ {active=$3}
219-
/Pages inactive/ {inactive=$3}
220-
/Pages speculative/ {speculative=$3}
221-
/Pages wired/ {wired=$4}
222-
END {
223-
used=(active+inactive+wired+speculative)*ps/1024/1024;
224-
free=free*ps/1024/1024;
225-
printf "Used: %.2f MB\nFree: %.2f MB\n", used, free
226-
}'
227-
228-
229193
- name: Free resources on macOS
230194
run: |
231195
echo "Disabling Spotlight indexing..."
@@ -248,7 +212,6 @@ jobs:
248212
working-directory: main
249213
if: ${{ matrix.run_steps && runner.os != 'Windows' }}
250214
run: |
251-
env
252215
${{ matrix.run_steps }}
253216
- name: Run on Windows
254217
working-directory: main
@@ -263,7 +226,6 @@ jobs:
263226
shell: bash
264227
working-directory: main
265228
run: |
266-
ls && pwd
267229
tar cf ${{ matrix.provide_artifact[0] }}.tar ${{ matrix.provide_artifact[1] }}
268230
- name: Upload artifacts
269231
if: ${{ matrix.provide_artifact }}

.github/workflows/ci-unittest-retagger.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
- name: Init Github branch
3434
working-directory: main
3535
run: |
36-
echo "Set new repo origin url"
3736
git remote set-url origin https://$GH_TOKEN@github.com/${{ github.repository }}.git
3837
git remote -v
3938
git config --global user.name "Retagger Workflow"
@@ -47,7 +46,6 @@ jobs:
4746
working-directory: main
4847
run: |
4948
mkdir -p ../retagger-reports ../diffs
50-
ls && ls ..
5149
mv retagger-report*.json ../retagger-reports
5250
5351
declare -a os_list=("linux-x86_64" "linux-aarch64" "win32-AMD64")

graalpython/com.oracle.graal.python.test/src/runner.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,6 @@ def update_tags(test_file: 'TestFile', results: list[TestResult], tag_platform:
497497
untag_failed=False, untag_skipped=False, untag_missing=False):
498498
current = read_tags(test_file, allow_exclusions=True)
499499
exclusions, current = partition_list(current, lambda t: t.is_exclusion)
500-
print(f"exclusions tests: {exclusions}")
501-
print(f"current tests: {current}")
502500
status_by_id = {r.test_id.normalized(): r.status for r in results}
503501
tag_by_id = {}
504502
for tag in current:
@@ -508,7 +506,6 @@ def update_tags(test_file: 'TestFile', results: list[TestResult], tag_platform:
508506
tag_by_id[tag.test_id] = tag
509507

510508
for test_id, status in status_by_id.items():
511-
512509
if tag := tag_by_id.get(test_id):
513510
if status == TestStatus.SUCCESS:
514511
tag_by_id[test_id] = tag.with_key(tag_platform)
@@ -1292,7 +1289,6 @@ def read_tags(test_file: TestFile, allow_exclusions=False) -> list[Tag]:
12921289
excluded_keys = []
12931290
for key in keys:
12941291
if key.startswith('$'):
1295-
print(f"[DEBUG] Found github excluded test {test} on platform {key}")
12961292
excluded_keys.append(key.removeprefix('$'))
12971293

12981294
tag = Tag(
@@ -1302,7 +1298,6 @@ def read_tags(test_file: TestFile, allow_exclusions=False) -> list[Tag]:
13021298
is_exclusion=is_exclusion,
13031299
comment=comment,
13041300
)
1305-
13061301
if not is_exclusion or allow_exclusions:
13071302
tags.append(tag)
13081303
comment = None

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ def _is_overridden_native_image_arg(prefix):
253253

254254

255255
def github_ci_build_args():
256+
# Determine memory and parallelism for GitHub CI builds
257+
# Use 90% of available memory up to 14GB, but at least 8GB
258+
# Set cores to number of CPUs if at least 4 cores and enough memory, otherwise 1
256259
total_mem = psutil.virtual_memory().total / (1024 ** 3)
257260
min_bound = 8
258261
max_mem = 14*1024
@@ -347,7 +350,6 @@ def libpythonvm_build_args():
347350
]
348351
else:
349352
print(invert("Not using an automatically selected PGO profile"), file=sys.stderr)
350-
print(f"[DEBUG] libpythonvm args: {build_args}")
351353
return build_args
352354

353355

@@ -849,7 +851,6 @@ def graalpy_standalone_home(standalone_type, enterprise=False, dev=False, build=
849851

850852
print(f"[DEBUG] GITHUB_CI env: {os.environ.get('GITHUB_CI')}")
851853
if GITHUB_CI:
852-
print("[DEBUG] Running in GitHub Ci")
853854
mx_args.append("--extra-image-builder-argument=-Ob")
854855
else:
855856
mx_args.append("--extra-image-builder-argument=-g")
@@ -1258,8 +1259,6 @@ def run_python_unittests(python_binary, args=None, paths=None, exclude=None, env
12581259
else:
12591260
args.append(os.path.relpath(_python_unittest_root()))
12601261

1261-
print(f"[DEBUG] args: {args}")
1262-
12631262
mx.logv(shlex.join([python_binary] + args))
12641263
if lock:
12651264
lock.release()

0 commit comments

Comments
 (0)